rebase -i: use a better reflog message

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 8462be1db6a0fe4f9e28cd1662be604196141055..971e21414ce2847a7b54a8bf122ab3f57e4868b3 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -934,4 +934,32 @@ test_expect_success 'rebase --edit-todo can be used to modify todo' '
        test L = $(git cat-file commit HEAD | sed -ne \$p)
 '
 
+test_expect_success 'rebase -i produces readable reflog' '
+       git reset --hard &&
+       git branch -f branch-reflog-test H &&
+       git rebase -i --onto I F branch-reflog-test &&
+       cat >expect <<-\EOF &&
+       rebase -i (start): checkout I
+       rebase -i (pick): G
+       rebase -i (pick): H
+       rebase -i (finish): returning to refs/heads/branch-reflog-test
+       EOF
+       tail -n 4 .git/logs/HEAD |
+       sed -e "s/.*    //" >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'rebase -i respects core.commentchar' '
+       git reset --hard &&
+       git checkout E^0 &&
+       test_config core.commentchar "\\" &&
+       write_script remove-all-but-first.sh <<-\EOF &&
+       sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
+       mv "$1.tmp" "$1"
+       EOF
+       test_set_editor "$(pwd)/remove-all-but-first.sh" &&
+       git rebase -i B &&
+       test B = $(git cat-file commit HEAD^ | sed -ne \$p)
+'
+
 test_done