aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-24 23:42:34 -0700
committerJunio C Hamano <junkio@cox.net>2005-09-24 23:42:34 -0700
commitcf408cb4a002855a9ffb58009c5f40da7f68b55e (patch)
tree3285f66b4ad5e9dd07e7f1f0e15361b8a0ff2c2a
parent7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794 (diff)
downloadgit-cf408cb4a002855a9ffb58009c5f40da7f68b55e.tar.gz
git-cf408cb4a002855a9ffb58009c5f40da7f68b55e.tar.xz
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>
-rw-r--r--Makefile1
-rwxr-xr-xcmd-rename.sh9
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 7afb946b5..67279203e 100644
--- 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
- sh ./cmd-rename.sh $(DESTDIR)$(bindir)
$(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 ad3285b79..f90b6babd 100755
--- a/cmd-rename.sh
+++ b/cmd-rename.sh
@@ -1,12 +1,15 @@
#!/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"
- if [ -x "$d/$new" ]; then
- ln -s "$new" "$d/$old"
- fi
done <<\EOF
git-add-script git-add
git-archimport-script git-archimport