Skip to content

Commit 2b5ba7b

Browse files
Martin von Zweigbergkgitster
authored andcommitted
add test case for rebase of empty commit
Signed-off-by: Junio C Hamano <[email protected]>
1 parent ac2b0e8 commit 2b5ba7b

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

t/t3401-rebase-partial.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,12 @@ test_expect_success 'rebase --merge topic branch that was partially merged upstr
4242
test_path_is_missing .git/rebase-merge
4343
'
4444

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+
4553
test_done

0 commit comments

Comments
 (0)