From 319f8b3da6858f78282de9483be7b27b4bb1ffba Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Tue, 1 Nov 2005 16:46:38 -0800
Subject: [PATCH] Do not install backward compatibility links anymore.

This is a companion patch to 4f9dcf7e5cf6c82455925102d315daf3b833e6d6
which stops mentioning the old command names.  As promised, we do not
install symlinks to let people use backward compatibility names anymore.

cmd-rename.sh script is still shipped to help people who installed
previous git by hand to clean up the leftover symlinks.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 Makefile      |  1 -
 cmd-rename.sh | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 67c10302b6..357cb3ec8c 100644
--- a/Makefile
+++ b/Makefile
@@ -413,7 +413,6 @@ check:
 install: $(PROGRAMS) $(SCRIPTS)
 	$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))
 	$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir))
-	sh ./cmd-rename.sh $(call shellquote,$(DESTDIR)$(bindir))
 	$(MAKE) -C templates install
 	$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
 	$(INSTALL) $(PYMODULES) $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
diff --git a/cmd-rename.sh b/cmd-rename.sh
index 34e7f494ed..992493de22 100755
--- a/cmd-rename.sh
+++ b/cmd-rename.sh
@@ -1,13 +1,21 @@
 #!/bin/sh
+#
+# If you installed git by hand previously, you may find this
+# script useful to remove the symbolic links that we shipped
+# for backward compatibility.
+#
+# Running this script with the previous installation directory
+# like this:
+#
+# $ cmd-rename.sh /usr/local/bin/
+#
+# would clean them.
+
 d="$1"
 test -d "$d" || exit
 while read old new
 do
 	rm -f "$d/$old"
-	if test -f "$d/$new"
-	then
-		ln -s "$new" "$d/$old" || exit
-	fi
 done <<\EOF
 git-add-script	git-add
 git-archimport-script	git-archimport
-- 
2.11.4.GIT