Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mz/empty-rebase-test'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 9 Jul 2012 16:02:15 +0000
(09:02 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 9 Jul 2012 16:02:15 +0000
(09:02 -0700)
We did not have test to make sure "git rebase" without extra options
filters out an empty commit in the original history.
* mz/empty-rebase-test:
add test case for rebase of empty commit
t/t3401-rebase-partial.sh
patch
|
blob
|
history
raw
(from parent 1:
faae885
)
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