add test case for rebase of empty commit
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin von Zweigbergk committed
Jun 27, 2012 at 09:22 UTC
2b5ba7b04631a457165531405710e8a303757b01
1 file changed
+8
t/t3401-rebase-partial.sh
+8
@@ -42,4 +42,12 @@ test_expect_success 'rebase --merge topic branch that was partially merged upstr
42
test_path_is_missing .git/rebase-merge
43
'
44
45
+test_expect_success 'rebase ignores empty commit' '
46
+ git reset --hard A &&
47
+ git commit --allow-empty -m empty &&
48
+ test_commit D &&
49
+ git rebase C &&
50
+ test $(git log --format=%s C..) = "D"
51
+'
52
+
53
test_done