File tree Expand file tree Collapse file tree 9 files changed +22
-22
lines changed
Expand file tree Collapse file tree 9 files changed +22
-22
lines changed Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ case "$1" in
2525 nstalled=install
2626 for branch in $branches
2727 do
28- if git- rev-parse --verify refs/heads/$branch 2> /dev/null
28+ if git rev-parse --verify refs/heads/$branch 2> /dev/null
2929 then
3030 echo " ** $branch **" &&
3131 git checkout $branch &&
@@ -84,7 +84,7 @@ maint | master)
8484 ;;
8585 esac >> ./:all.log 2>&1 &&
8686 case " $V " in
87- * .rc[0-9]* )
87+ * .rc[0-9]* | * -rc[0-9] * )
8888 mkdir -p $G /testing &&
8989 for a in $narch
9090 do
Original file line number Diff line number Diff line change 33# Rebuild "pu" from topic branches.
44#
55
6- git- update-index --refresh || exit
7- case " $( git- diff-index --name-status HEAD) " in
6+ git update-index --refresh || exit
7+ case " $( git diff-index --name-status HEAD) " in
88' ' ) ;;
99* ) echo 2>&1 " Local modifications exist."
1010 exit 1;;
@@ -36,14 +36,14 @@ case "$#" in
3636 NHH=
3737 for H in $HH
3838 do
39- HSHA1=` git- rev-parse --verify $H ` || continue
40- MB=` git- show-branch --merge-base pu $HSHA1 `
39+ HSHA1=` git rev-parse --verify $H ` || continue
40+ MB=` git show-branch --merge-base pu $HSHA1 `
4141 case " $LF$MB$LF " in
4242 * " $LF$HSHA1$LF " * ) continue ;; # already merged.
4343 esac
4444 I=$(( $I + 1 ))
4545 echo -n " $I : "
46- git- show-branch $H
46+ git show-branch $H
4747 NHH=" ${NHH} $H "
4848 done
4949 case " $I " in
Original file line number Diff line number Diff line change 1919 topic_sha1=` git rev-parse --verify " refs/heads/$topic " `
2020
2121 date=`
22- git- rev-list -1 --pretty " $topic " |
22+ git rev-list -1 --pretty " $topic " |
2323 sed -ne ' s/^Date: *\(.*\)/ (\1)/p'
2424 `
25- only_next_1=` git- rev-list ^master " ^$topic " next | sort`
26- only_next_2=` git- rev-list ^master next | sort`
25+ only_next_1=` git rev-list ^master " ^$topic " next | sort`
26+ only_next_2=` git rev-list ^master next | sort`
2727 rebase=
2828 if test " $only_next_1 " = " $only_next_2 "
2929 then
30- not_in_topic=` git- rev-list " ^$topic " master`
30+ not_in_topic=` git rev-list " ^$topic " master`
3131 if test -z " $not_in_topic "
3232 then
3333 : ; # already up-to-date.
3838 if test -n " $rebase "
3939 then
4040 echo " Rebasing $topic to pick up:"
41- git- rev-list --pretty=oneline " ^$topic " master |
41+ git rev-list --pretty=oneline " ^$topic " master |
4242 sed -e ' s/^[0-9a-f]* / * /'
4343 git checkout " $topic " &&
4444 git rebase master || break ;
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ case "$#,$1" in
2020 base_branch=master
2121 ;;
2222 2)
23- base_branch=$( git- rev-parse --verify " $2 " ) || exit
23+ base_branch=$( git rev-parse --verify " $2 " ) || exit
2424 ;;
2525 * )
2626 echo >&2 " $usage "
Original file line number Diff line number Diff line change 2424 shift
2525done
2626
27- git- send-email \
27+ git send-email \
2828 --from=" $me " \
2929 --envelope-sender=" $me " \
3030 --to=" $to " \
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ trap 'rm -f $tmp-*' 0
66since=" $1 "
77until=" $2 "
88
9- git- rev-list --no-merges " master@{$1 }..master@{$2 }" > " $tmp -0.txt"
9+ git rev-list --no-merges " master@{$1 }..master@{$2 }" > " $tmp -0.txt"
1010top=" master@{$until }"
1111bottom=" master@{$since }"
1212
Original file line number Diff line number Diff line change 2424 installed=$( git describe $version )
2525 in=" [41;37m" out=" [m" installed=" $installed "
2626 fi
27- echo " $in$v$out $( git- describe refs/heads/$v ) $installed "
27+ echo " $in$v$out $( git describe refs/heads/$v ) $installed "
2828done
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ echo "X-maint-at: $maint_at"
1313echo " X-master-at: $master_at "
1414
1515tagged=` git rev-parse --not --verify hold/sa/maint`
16- list=` git- rev-list $tagged refs/heads/maint 2> /dev/null`
16+ list=` git rev-list $tagged refs/heads/maint 2> /dev/null`
1717if test -n " $list "
1818then
1919 echo
2323fi
2424
2525tagged=` git rev-parse --not --verify hold/sa/master`
26- list=` git- rev-list $tagged refs/heads/master 2> /dev/null`
26+ list=` git rev-list $tagged refs/heads/master 2> /dev/null`
2727if test -n " $list "
2828then
2929 echo
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ case " $* " in
1212 echo $HOME /git-doc/dodoc.sh | at now
1313 ;;
1414esac
15- exec git- update-server-info
15+ exec git update-server-info
1616$ chmod +x hooks/post-update
1717
1818END_OF_COMMENTARY
@@ -25,7 +25,7 @@ END_OF_COMMENTARY
2525# updated the updates are pushed back into their own branches
2626# in git.git repository.
2727
28- ID=` git- rev-parse --verify refs/heads/master` || exit $?
28+ ID=` git rev-parse --verify refs/heads/master` || exit $?
2929
3030unset GIT_DIR
3131
@@ -44,8 +44,8 @@ trap 'rm -f "$tmp".*' 0
4444 git pull " $MASTERREPO " master &&
4545 git fetch --tags " $MASTERREPO "
4646) > /dev/null 2> /dev/null || exit $?
47- test $( git- rev-parse --verify refs/heads/master) == " $ID " &&
48- NID=$( git- describe --abbrev=4 " $ID " ) &&
47+ test $( git rev-parse --verify refs/heads/master) == " $ID " &&
48+ NID=$( git describe --abbrev=4 " $ID " ) &&
4949test ' ' ! = " $NID " || exit $?
5050
5151# Set up subrepositories
You can’t perform that action at this time.
0 commit comments