diff --git a/DoKernelOrg b/DoKernelOrg index 872fa8fc24..085265828e 100755 --- a/DoKernelOrg +++ b/DoKernelOrg @@ -25,7 +25,7 @@ case "$1" in 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 && @@ -84,7 +84,7 @@ maint | master) ;; 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 diff --git a/PU b/PU index 4b4be2ba42..2a7f00b0a6 100755 --- a/PU +++ b/PU @@ -3,8 +3,8 @@ # 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;; @@ -36,14 +36,14 @@ case "$#" in 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 diff --git a/RB b/RB index 918a3727f7..c557b06971 100755 --- a/RB +++ b/RB @@ -19,15 +19,15 @@ do 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. @@ -38,7 +38,7 @@ do 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; diff --git a/RP b/RP index 917cca2f16..d837c1d57b 100755 --- a/RP +++ b/RP @@ -20,7 +20,7 @@ case "$#,$1" in base_branch=master ;; 2) - base_branch=$(git-rev-parse --verify "$2") || exit + base_branch=$(git rev-parse --verify "$2") || exit ;; *) echo >&2 "$usage" diff --git a/SE b/SE index 82b71af441..78a4fd157e 100755 --- a/SE +++ b/SE @@ -24,7 +24,7 @@ do shift done -git-send-email \ +git send-email \ --from="$me" \ --envelope-sender="$me" \ --to="$to" \ diff --git a/Summary b/Summary index 60976cd444..951bc9f9aa 100755 --- a/Summary +++ b/Summary @@ -6,7 +6,7 @@ trap 'rm -f $tmp-*' 0 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}" diff --git a/V b/V index 000a1d8fe1..572cc78b6a 100755 --- a/V +++ b/V @@ -24,5 +24,5 @@ do installed=$(git describe $version) in="" out="" installed=" $installed" fi - echo "$in$v$out $(git-describe refs/heads/$v)$installed" + echo "$in$v$out $(git describe refs/heads/$v)$installed" done diff --git a/WI b/WI index 1e4f4e9444..c4f429e834 100755 --- a/WI +++ b/WI @@ -13,7 +13,7 @@ echo "X-maint-at: $maint_at" 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 @@ -23,7 +23,7 @@ then 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 diff --git a/dodoc.sh b/dodoc.sh index babafb27af..20c0c933f8 100755 --- a/dodoc.sh +++ b/dodoc.sh @@ -12,7 +12,7 @@ case " $* " in 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 @@ -25,7 +25,7 @@ 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 @@ -44,8 +44,8 @@ trap 'rm -f "$tmp".*' 0 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