From: Junio C Hamano <junkio@cox.net>
Date: Sun, 6 Nov 2005 09:55:31 +0000 (-0800)
Subject: Adjust the support scripts to "git binary directory" change.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=32a1e647773bffe10c40a1fdff1bfbf73806c4b8;p=git.git

Adjust the support scripts to "git binary directory" change.

Luckily, as long as you use "git" wrapper, you are forward/backward
compatible.

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

diff --git a/KO b/KO
index f8decd21..8550df0d 100755
--- a/KO
+++ b/KO
@@ -4,8 +4,8 @@
 # I do not accidentally push a rewound master to public.
 
 git fetch ko
-mb=$(git-merge-base ko-master master)
-h=$(git-rev-parse $mb ko-master | sort -u | wc -l)
+mb=$(git merge-base ko-master master)
+h=$(git rev-parse $mb ko-master | sort -u | wc -l)
 if test "$h" != 1
 then
 	echo "OOOOOPPPPPPPPPPPPPPSSS! master is not ko-master fast forward."
diff --git a/Make b/Make
index c4f084e1..47d3946a 100755
--- a/Make
+++ b/Make
@@ -9,6 +9,7 @@ export PATH LANG LC_CTYPE
 
 #make prefix=/usr/local \
 make bindir=$HOME/bin/Linux \
+     gitdir=$HOME/lib/gitbin \
      PYTHON_PATH=/usr/bin/python2.4 \
      CFLAGS='-O1 -Wall -g'"$DDD" \
      WITH_SEND_EMAIL=YesPlease \
diff --git a/PU b/PU
index 8d3d38f3..856b582b 100755
--- a/PU
+++ b/PU
@@ -3,19 +3,17 @@
 # Rebuild "pu" from topic branches.
 #
 
-. git-sh-setup
-
-git-status && exit
-git-checkout pu &&
-git-reset --hard master &&
-ORIG_HEAD=`git-rev-parse ORIG_HEAD` || exit
+git status && exit
+git checkout pu &&
+git reset --hard master &&
+ORIG_HEAD=`git rev-parse ORIG_HEAD` || exit
 
 for H
 do
-	(IFS=",$IFS"; git-pull -n . $H) || exit
+	(IFS=",$IFS"; git pull -n . $H) || exit
 done
 
-(IFS=",$IFS"; git-show-branch master pu $* $ORIG_HEAD)
+(IFS=",$IFS"; git show-branch master pu $* $ORIG_HEAD)