summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-15 19:06:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-15 19:06:48 (GMT)
commit754e66b7a0bec277c319a4d6105024d210f47066 (patch)
tree891737371e4d34eab84e01add8da1a839da1e5e7 /t/t3404-rebase-interactive.sh
parent849865733fc667789d0e57edd1ac2ee1f38499a3 (diff)
parent57f2b6b25868e32a25181b2a345b5bab3e3ba78f (diff)
downloadgit-754e66b7a0bec277c319a4d6105024d210f47066.zip
git-754e66b7a0bec277c319a4d6105024d210f47066.tar.gz
git-754e66b7a0bec277c319a4d6105024d210f47066.tar.bz2
Merge branch 'jc/rebase-i-commit-msg-fix'
* jc/rebase-i-commit-msg-fix: rebase-i: do not get fooled by a log message ending with backslash rebase-i: style fix
Diffstat (limited to 't/t3404-rebase-interactive.sh')
-rwxr-xr-xt/t3404-rebase-interactive.sh18
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index ee9a1b2..47ca88f 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -630,4 +630,22 @@ test_expect_success 'always cherry-pick with --no-ff' '
test_cmp empty out
'
+test_expect_success 'set up commits with funny messages' '
+ git checkout -b funny A &&
+ echo >>file1 &&
+ test_tick &&
+ git commit -a -m "end with slash\\" &&
+ echo >>file1 &&
+ test_tick &&
+ git commit -a -m "another commit"
+'
+
+test_expect_success 'rebase-i history with funny messages' '
+ git rev-list A..funny >expect &&
+ test_tick &&
+ FAKE_LINES="1 2" git rebase -i A &&
+ git rev-list A.. >actual &&
+ test_cmp expect actual
+'
+
test_done