diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-03 03:05:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-03 03:05:39 -0700 |
| commit | 9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2 (patch) | |
| tree | b25e282c2248e5a079b56e95607f0509422e062a /t/t3404-rebase-interactive.sh | |
| parent | 0341091a9ec47576a2fdfab181145fa94c04b810 (diff) | |
| parent | 73697a0b572f7f216d8355d83bf69e9b42e9a077 (diff) | |
| download | git-9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2.tar.gz git-9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2.tar.xz | |
Merge branch 'js/rebase-i'
* js/rebase-i:
rebase -i: work on a detached HEAD
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index f5ef8c225..11139048f 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -309,4 +309,12 @@ test_expect_success '--continue tries to commit, even for "edit"' ' test $parent = $(git rev-parse HEAD^) ' +test_expect_success 'rebase a detached HEAD' ' + grandparent=$(git rev-parse HEAD~2) && + git checkout $(git rev-parse HEAD) && + test_tick && + FAKE_LINES="2 1" git rebase -i HEAD~2 && + test $grandparent = $(git rev-parse HEAD~2) +' + test_done |