On Wed, Aug 08, 2012 at 09:48:18AM -0700, Martin von Zweigbergk wrote:
Signed-off-by: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
---
While trying to use patch-id instead of
--ignore-if-in-upstream/--cherry-pick/cherry/etc, I noticed that
patch-id ignores empty patches and I was surprised that tests still
pass. This test case would be useful to protect --keep-empty.
t/t3401-rebase-partial.sh | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh
index 7f8693b..b89b512 100755
--- a/t/t3401-rebase-partial.sh
+++ b/t/t3401-rebase-partial.sh
@@ -47,7 +47,14 @@ test_expect_success 'rebase ignores empty commit' '
git commit --allow-empty -m empty
test_commit D
git rebase C
- test $(git log --format=%s C..) = D
+ test $(git log --format=%s C..) = D
+'
+
+test_expect_success 'rebase --keep-empty' '
+ git reset --hard D
+ git rebase --keep-empty C
+ test $(git log --format=%s C..) = D
+empty
'
test_done
--
1.7.11.1.104.ge7b44f1
Acked-by: Neil Horman nhor...@tuxdriver.com
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
