diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2013-06-14 18:47:52 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-14 09:41:18 -0700 |
| commit | 2e6e276decde2a9f04fc29bce734a49d3ba8f484 (patch) | |
| tree | 86adfcb9208d50e5b3aa1f59501e945ecf66e7c7 /t/t3400-rebase.sh | |
| parent | bac1ddd0f86bc5955c24f89e402de80d2844efb5 (diff) | |
| download | git-2e6e276decde2a9f04fc29bce734a49d3ba8f484.tar.gz git-2e6e276decde2a9f04fc29bce734a49d3ba8f484.tar.xz | |
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>
Diffstat (limited to 't/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 81ec51762..cbca71ed5 100755 --- 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_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") && |