Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
i18n: pack-refs: mark parseopt strings for translation
[gitweb.git]
/
t
/
t3401-rebase-partial.sh
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