rebase: use peel_committish() where appropriate

The revisions specified on the command-line as <onto> and <upstream>
arguments could be of the form :/quuxery; so, use peel_committish() to
resolve them.  The failing tests in t/rebase and t/rebase-interactive
now pass.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase.sh b/git-rebase.sh
index d0c11a910a69603ac19c83a5d29af9f32f780267..6987b9b6db0b81ff4fa0ab8981c690c9a3765612 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -434,7 +434,7 @@ then
                shift
                ;;
        esac
                shift
                ;;
        esac

-       upstream=`git rev-parse --verify "${upstream_name}^0"` ||
+       upstream=$(peel_committish "${upstream_name}") ||

        die "$(eval_gettext "invalid upstream \$upstream_name")"
        upstream_arg="$upstream_name"
 else
        die "$(eval_gettext "invalid upstream \$upstream_name")"
        upstream_arg="$upstream_name"
 else


@@ -470,7 +470,7 @@ case "$onto_name" in
        fi
        ;;
 *)
        fi
        ;;
 *)

-       onto=$(git rev-parse --verify "${onto_name}^0") ||
+       onto=$(peel_committish "$onto_name") ||

        die "$(eval_gettext "Does not point to a valid commit: \$onto_name")"
        ;;
 esac
        die "$(eval_gettext "Does not point to a valid commit: \$onto_name")"
        ;;
 esac

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 81ec5176294083135abd5d7e03f3a213ce7da497..cbca71ed56bd4443cbfc1f4842eb589b6beeae16 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -88,7 +88,7 @@ test_expect_success 'rebase fast-forward to master' '
        test_i18ngrep "Fast-forwarded HEAD to my-topic-branch" out
 '
 
        test_i18ngrep "Fast-forwarded HEAD to my-topic-branch" out
 '
 

-test_expect_failure 'rebase, with <onto> and <upstream> specified as :/quuxery' '
+test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '

        test_when_finished "git branch -D torebase" &&
        git checkout -b torebase my-topic-branch^ &&
        upstream=$(git rev-parse ":/Add B") &&
        test_when_finished "git branch -D torebase" &&
        git checkout -b torebase my-topic-branch^ &&
        upstream=$(git rev-parse ":/Add B") &&

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index eb241f531273819ef9e62f20fdbe4811996a3fc6..86917d172f78ca4b5edd5dfe1334d1f1100fe36b 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -947,7 +947,7 @@ test_expect_success 'rebase -i respects core.commentchar' '
        test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 '
 
        test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 '
 

-test_expect_failure 'rebase -i, with <onto> and <upstream> specified as :/quuxery' '
+test_expect_success 'rebase -i, with <onto> and <upstream> specified as :/quuxery' '

        test_when_finished "git branch -D torebase" &&
        git checkout -b torebase branch1 &&
        upstream=$(git rev-parse ":/J") &&
        test_when_finished "git branch -D torebase" &&
        git checkout -b torebase branch1 &&
        upstream=$(git rev-parse ":/J") &&