diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-25 22:46:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-25 22:46:59 (GMT) |
| commit | 7b9f29c40f52084c4e3abf7d2a4212c15aa63ae6 (patch) | |
| tree | 2c6b9415dc1cda4caee36d06c8bfe6e4a188c0a5 /t/t3404-rebase-interactive.sh | |
| parent | b00445bc349d6a4d09c8226dd43c60a097d70e27 (diff) | |
| parent | 2147f844ed13fa5052161d38f8cf7dca6f83c06e (diff) | |
| download | git-7b9f29c40f52084c4e3abf7d2a4212c15aa63ae6.zip git-7b9f29c40f52084c4e3abf7d2a4212c15aa63ae6.tar.gz git-7b9f29c40f52084c4e3abf7d2a4212c15aa63ae6.tar.bz2 | |
Merge branch 'cw/rebase-i-root'
Finishing touches to the "rebase -i --root" (new feature for
1.7.12).
* cw/rebase-i-root:
rebase -i: handle fixup of root commit correctly
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 8078db6..3f75d32 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -903,4 +903,12 @@ test_expect_success 'rebase -i --root temporary sentinel commit' ' git rebase --abort ' +test_expect_success 'rebase -i --root fixup root commit' ' + git checkout B && + FAKE_LINES="1 fixup 2" git rebase -i --root && + test A = $(git cat-file commit HEAD | sed -ne \$p) && + test B = $(git show HEAD:file1) && + test 0 = $(git cat-file commit HEAD | grep -c ^parent\ ) +' + test_done |