Teach format-patch, rebase and cherry a..b format

Although these commands take only begin and end, not necessarily generic SHA1 expressions rev-parse supports, supporting a..b notation is good for consistency. This commit adds such without breaking backward compatibility. Signed-off-by: Junio C Hamano <junkio@cox.net>
20 years ago · 4282c4fbdd
3 changed files with 47 additions and 22 deletions
--- a/25
+++ b/25
@ -3,6 +3,8 @@
				@@ -3,6 +3,8 @@
 # Copyright (c) 2005 Junio C Hamano.
 #

+. git-sh-setup-script || die "Not a git archive."
+
 usage="usage: $0 "'<upstream> [<head>]

             __*__*__*__*__> <upstream>
@ -18,8 +20,8 @@ upstream, it is shown on the standard output.
				@@ -18,8 +20,8 @@ upstream, it is shown on the standard output.
 The output is intended to be used as:

    OLD_HEAD=$(git-rev-parse HEAD)
-    git-rev-parse linus >${GIT_DIR-.}/HEAD
-    git-cherry linus OLD_HEAD |
+    git-rev-parse upstream >${GIT_DIR-.}/HEAD
+    git-cherry upstream $OLD_HEAD |
    while read commit
    do
        GIT_EXTERNAL_DIFF=git-apply-patch-script git-diff-tree -p "$commit" &&
@ -27,20 +29,27 @@ The output is intended to be used as:
				@@ -27,20 +29,27 @@ The output is intended to be used as:
    done
 '

+case "$#,$1" in
+1,*..*)
+    upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$')
+    set x "$upstream" "$ours"
+    shift ;;
+esac
+
 case "$#" in
-1) linus=`git-rev-parse --verify "$1"` &&
-   junio=`git-rev-parse --verify HEAD` || exit
+1) upstream=`git-rev-parse --verify "$1"` &&
+   ours=`git-rev-parse --verify HEAD` || exit
   ;;
-2) linus=`git-rev-parse --verify "$1"` &&
-   junio=`git-rev-parse --verify "$2"` || exit
+2) upstream=`git-rev-parse --verify "$1"` &&
+   ours=`git-rev-parse --verify "$2"` || exit
   ;;
 *) echo >&2 "$usage"; exit 1 ;;
 esac

 # Note that these list commits in reverse order;
 # not that the order in inup matters...
-inup=`git-rev-list ^$junio $linus` &&
-ours=`git-rev-list $junio ^$linus` || exit
+inup=`git-rev-list ^$ours $upstream` &&
+ours=`git-rev-list $ours ^$upstream` || exit

 tmp=.cherry-tmp$$
 patch=$tmp-patch
--- a/21
+++ b/21
@ -3,6 +3,8 @@
				@@ -3,6 +3,8 @@
 # Copyright (c) 2005 Junio C Hamano
 #

+. git-sh-setup-script || die "Not a git archive."
+
 usage () {
    echo >&2 "usage: $0"' [-n] [-o dir] [--mbox] [--check] [-<diff options>...] upstream [ our-head ]

@ -60,13 +62,20 @@ do
				@@ -60,13 +62,20 @@ do
    shift
 done

+revpair=
 case "$#" in
-2)    linus="$1" junio="$2" ;;
-1)    linus="$1" junio=HEAD ;;
-*)    usage ;;
+2)
+    revpair="$1..$2" ;;
+1)
+    case "$1" in
+    *..*)
+    	revpair="$1";;
+    *)
+	revpair="$1..HEAD";;
+    esac ;;
+*)
+    usage ;;
 esac
-junio=`git-rev-parse --verify "$junio"`
-linus=`git-rev-parse --verify "$linus"`

 me=`git-var GIT_AUTHOR_IDENT | sed -e 's/>.*/>/'`

@ -108,7 +117,7 @@ _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
				@@ -108,7 +117,7 @@ _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 stripCommitHead='/^'"$_x40"' (from '"$_x40"')$/d'

-git-rev-list --merge-order "$junio" "^$linus" >$series
+git-rev-list --merge-order $(git-rev-parse --revs-only "$revpair") >$series
 total=`wc -l <$series | tr -dc "[0-9]"`
 i=$total
 while read commit
--- a/23
+++ b/23
@ -3,25 +3,32 @@
				@@ -3,25 +3,32 @@
 # Copyright (c) 2005 Junio C Hamano.
 #

+. git-sh-setup-script || die "Not a git archive."
+
 usage="usage: $0 "'<upstream> [<head>]

 Uses output from git-cherry to rebase local commits to the new head of
 upstream tree.'

-: ${GIT_DIR=.git}
+case "$#,$1" in
+1,*..*)
+    upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$')
+    set x "$upstream" "$ours"
+    shift ;;
+esac

 case "$#" in
-1) linus=`git-rev-parse --verify "$1"` &&
-   junio=`git-rev-parse --verify HEAD` || exit
+1) upstream=`git-rev-parse --verify "$1"` &&
+   ours=`git-rev-parse --verify HEAD` || exit
   ;;
-2) linus=`git-rev-parse --verify "$1"` &&
-   junio=`git-rev-parse --verify "$2"` || exit
+2) upstream=`git-rev-parse --verify "$1"` &&
+   ours=`git-rev-parse --verify "$2"` || exit
   ;;
 *) echo >&2 "$usage"; exit 1 ;;
 esac

-git-read-tree -m -u $junio $linus &&
-echo "$linus" >"$GIT_DIR/HEAD" || exit
+git-read-tree -m -u $ours $upstream &&
+echo "$upstream" >"$GIT_DIR/HEAD" || exit

 tmp=.rebase-tmp$$
 fail=$tmp-fail
@ -29,7 +36,7 @@ trap "rm -rf $tmp-*" 0 1 2 3 15
				@@ -29,7 +36,7 @@ trap "rm -rf $tmp-*" 0 1 2 3 15

 >$fail

-git-cherry $linus $junio |
+git-cherry $upstream $ours |
 while read sign commit
 do
 	case "$sign" in