nstalled=install
for branch in $branches
do
- if git-rev-parse --verify refs/heads/$branch 2>/dev/null
+ if git rev-parse --verify refs/heads/$branch 2>/dev/null
then
echo "** $branch **" &&
git checkout $branch &&
;;
esac >>./:all.log 2>&1 &&
case "$V" in
- *.rc[0-9]*)
+ *.rc[0-9]* | *-rc[0-9]*)
mkdir -p $G/testing &&
for a in $narch
do
# Rebuild "pu" from topic branches.
#
-git-update-index --refresh || exit
-case "$(git-diff-index --name-status HEAD)" in
+git update-index --refresh || exit
+case "$(git diff-index --name-status HEAD)" in
'') ;;
*) echo 2>&1 "Local modifications exist."
exit 1;;
NHH=
for H in $HH
do
- HSHA1=`git-rev-parse --verify $H` || continue
- MB=`git-show-branch --merge-base pu $HSHA1`
+ HSHA1=`git rev-parse --verify $H` || continue
+ MB=`git show-branch --merge-base pu $HSHA1`
case "$LF$MB$LF" in
*"$LF$HSHA1$LF"*) continue ;; # already merged.
esac
I=$(($I+1))
echo -n "$I: "
- git-show-branch $H
+ git show-branch $H
NHH="${NHH}$H "
done
case "$I" in
topic_sha1=`git rev-parse --verify "refs/heads/$topic"`
date=`
- git-rev-list -1 --pretty "$topic" |
+ git rev-list -1 --pretty "$topic" |
sed -ne 's/^Date: *\(.*\)/ (\1)/p'
`
- only_next_1=`git-rev-list ^master "^$topic" next | sort`
- only_next_2=`git-rev-list ^master next | sort`
+ only_next_1=`git rev-list ^master "^$topic" next | sort`
+ only_next_2=`git rev-list ^master next | sort`
rebase=
if test "$only_next_1" = "$only_next_2"
then
- not_in_topic=`git-rev-list "^$topic" master`
+ not_in_topic=`git rev-list "^$topic" master`
if test -z "$not_in_topic"
then
:; # already up-to-date.
if test -n "$rebase"
then
echo "Rebasing $topic to pick up:"
- git-rev-list --pretty=oneline "^$topic" master |
+ git rev-list --pretty=oneline "^$topic" master |
sed -e 's/^[0-9a-f]* / * /'
git checkout "$topic" &&
git rebase master || break;
base_branch=master
;;
2)
- base_branch=$(git-rev-parse --verify "$2") || exit
+ base_branch=$(git rev-parse --verify "$2") || exit
;;
*)
echo >&2 "$usage"
shift
done
-git-send-email \
+git send-email \
--from="$me" \
--envelope-sender="$me" \
--to="$to" \
since="$1"
until="$2"
-git-rev-list --no-merges "master@{$1}..master@{$2}" >"$tmp-0.txt"
+git rev-list --no-merges "master@{$1}..master@{$2}" >"$tmp-0.txt"
top="master@{$until}"
bottom="master@{$since}"
installed=$(git describe $version)
in="\e[41;37m" out="\e[m" installed=" $installed"
fi
- echo "$in$v$out $(git-describe refs/heads/$v)$installed"
+ echo "$in$v$out $(git describe refs/heads/$v)$installed"
done
echo "X-master-at: $master_at"
tagged=`git rev-parse --not --verify hold/sa/maint`
-list=`git-rev-list $tagged refs/heads/maint 2>/dev/null`
+list=`git rev-list $tagged refs/heads/maint 2>/dev/null`
if test -n "$list"
then
echo
fi
tagged=`git rev-parse --not --verify hold/sa/master`
-list=`git-rev-list $tagged refs/heads/master 2>/dev/null`
+list=`git rev-list $tagged refs/heads/master 2>/dev/null`
if test -n "$list"
then
echo
echo $HOME/git-doc/dodoc.sh | at now
;;
esac
-exec git-update-server-info
+exec git update-server-info
$ chmod +x hooks/post-update
END_OF_COMMENTARY
# updated the updates are pushed back into their own branches
# in git.git repository.
-ID=`git-rev-parse --verify refs/heads/master` || exit $?
+ID=`git rev-parse --verify refs/heads/master` || exit $?
unset GIT_DIR
git pull "$MASTERREPO" master &&
git fetch --tags "$MASTERREPO"
) >/dev/null 2>/dev/null || exit $?
-test $(git-rev-parse --verify refs/heads/master) == "$ID" &&
-NID=$(git-describe --abbrev=4 "$ID") &&
+test $(git rev-parse --verify refs/heads/master) == "$ID" &&
+NID=$(git describe --abbrev=4 "$ID") &&
test '' != "$NID" || exit $?
# Set up subrepositories