summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-25 15:46:59 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-25 15:46:59 -0700
commit7b9f29c40f52084c4e3abf7d2a4212c15aa63ae6 (patch)
tree2c6b9415dc1cda4caee36d06c8bfe6e4a188c0a5 /t/t3404-rebase-interactive.sh
parentb00445bc349d6a4d09c8226dd43c60a097d70e27 (diff)
parent2147f844ed13fa5052161d38f8cf7dca6f83c06e (diff)
downloadgit-7b9f29c40f52084c4e3abf7d2a4212c15aa63ae6.tar.gz
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-xt/t3404-rebase-interactive.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 8078db6856..3f75d328de 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