From: Junio C Hamano <junkio@cox.net>
Date: Fri, 30 Sep 2005 07:27:11 +0000 (-0700)
Subject: Still installing the old command names.
X-Git-Tag: v0.99.8~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=894a8a8b1b935639ac2ea503e8fa2887fd6bd44b;p=git.git

Still installing the old command names.

After seeing Jeff's guide, I changed my mind about the
big-rename transition plan.  Even if Porcelains are kept up to
date, those web documents that describes older world order would
live longer and people will stumble across them via google
searches.  And who knows how many mirrored copies there are.

The backward compatible symbolic links *will* be removed before
1.0.  But that will not happen in 0.99.8.

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

diff --git a/Makefile b/Makefile
index 9920467d9..e943954cf 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 f90b6babd..34e7f494e 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