projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ac2b0e8
)
add test case for rebase of empty commit
author
Martin von Zweigbergk
<martin.von.zweigbergk@gmail.com>
Wed, 27 Jun 2012 16:22:01 +0000
(09:22 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 27 Jun 2012 21:02:51 +0000
(14:02 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3401-rebase-partial.sh
patch
|
blob
|
history
diff --git
a/t/t3401-rebase-partial.sh
b/t/t3401-rebase-partial.sh
index 7ba17974c585d005fb4f1c757b76377f0c0518a5..7f8693b928fdb827906f7c51ec0a13b2f36c5b83 100755
(executable)
--- 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