Stop installing the backward compatible symlinks.

Also cmd-renames.sh can now be used to remove the backward compatible
symlinks -- this is not used by default in any way.

As discussed on the list with Pasky, git-ssh-push and git-ssh-pull will
keep calling each other for a while longer.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 7afb946b5147be0feb964b7c64c520062d405619..67279203e8d3aabd57152e247a565462257bf406 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -344,7 +344,6 @@ install: $(PROGRAMS) $(SCRIPTS)
        $(INSTALL) -d -m755 $(DESTDIR)$(bindir)
        $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
        $(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
        $(INSTALL) -d -m755 $(DESTDIR)$(bindir)
        $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
        $(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick

-       sh ./cmd-rename.sh $(DESTDIR)$(bindir)

        $(MAKE) -C templates install
        $(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR)
        $(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR)
        $(MAKE) -C templates install
        $(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR)
        $(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR)

diff --git a/cmd-rename.sh b/cmd-rename.sh
index ad3285b7977b7dd1a7f152652004b2731e75b8cb..f90b6babd4f7a8dd1f747b44abf41891745c8031 100755 (executable)
--- a/cmd-rename.sh
+++ b/cmd-rename.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 #!/bin/sh

+#
+# This is for people who installed previous GIT by hand and would want
+# to remove the backward compatible links:
+#
+# ./cmd-rename.sh $bindir
+#

 d="$1"
 test -d "$d" || exit
 while read old new
 do
        rm -f "$d/$old"
 d="$1"
 test -d "$d" || exit
 while read old new
 do
        rm -f "$d/$old"

-       if [ -x "$d/$new" ]; then
-       ln -s "$new" "$d/$old"
-       fi

 done <<\EOF
 git-add-script git-add
 git-archimport-script  git-archimport
 done <<\EOF
 git-add-script git-add
 git-archimport-script  git-archimport