summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rwxr-xr-xcmd-rename.sh14
2 files changed, 6 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 9920467..e943954 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ PROGRAMS = \
git-update-ref \
$(SIMPLE_PROGRAMS)
-# Backward compatibility -- to be removed in 0.99.8
+# Backward compatibility -- to be removed after 1.0
PROGRAMS += git-ssh-pull git-ssh-push
PYMODULES = \
@@ -345,6 +345,7 @@ 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 f90b6ba..34e7f49 100755
--- a/cmd-rename.sh
+++ b/cmd-rename.sh
@@ -1,15 +1,13 @@
#!/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 test -f "$d/$new"
+ then
+ ln -s "$new" "$d/$old" || exit
+ fi
done <<\EOF
git-add-script git-add
git-archimport-script git-archimport
@@ -54,7 +52,3 @@ git-update-cache git-update-index
git-convert-cache git-convert-objects
git-fsck-cache git-fsck-objects
EOF
-
-# These two are a bit more than symlinks now.
-# git-ssh-push git-ssh-upload
-# git-ssh-pull git-ssh-fetch