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>
This commit is contained in:
Junio C Hamano
2005-11-06 01:55:31 -08:00
parent 73610e157c
commit 32a1e64777
3 changed files with 9 additions and 10 deletions

4
KO
View File

@@ -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."

1
Make
View File

@@ -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 \

14
PU
View File

@@ -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)