summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>2012-06-27 09:22:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-27 14:02:51 -0700
commit2b5ba7b04631a457165531405710e8a303757b01 (patch)
tree48e132134bdebe052365305a8b5a57b63c1788ff /t
parentcherry-pick: regression fix for empty commits (diff)
downloadtgif-2b5ba7b04631a457165531405710e8a303757b01.tar.xz
add test case for rebase of empty commit
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3401-rebase-partial.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh
index 7ba17974c5..7f8693b928 100755
--- a/t/t3401-rebase-partial.sh
+++ b/t/t3401-rebase-partial.sh
@@ -42,4 +42,12 @@ test_expect_success 'rebase --merge topic branch that was partially merged upstr
test_path_is_missing .git/rebase-merge
'
+test_expect_success 'rebase ignores empty commit' '
+ git reset --hard A &&
+ git commit --allow-empty -m empty &&
+ test_commit D &&
+ git rebase C &&
+ test $(git log --format=%s C..) = "D"
+'
+
test_done