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>
Junio C Hamano committed
Nov 6, 2005 at 01:55 UTC
32a1e647773bffe10c40a1fdff1bfbf73806c4b8
3 files changed
+9
-10
KO
+2
-2
index f8decd210f..8550df0de0 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."
Make
+1
index c4f084e11c..47d3946a77 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 \
PU
+6
-8
index 8d3d38f3d3..856b582b3c 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)