diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-18 12:48:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-18 12:48:20 -0700 |
| commit | afbfcaa98396de66e42dc3c845f396c5ba508ced (patch) | |
| tree | 7c3e806f0f1bbfeb8a02971daf04c68c51f4840c /t/t3404-rebase-interactive.sh | |
| parent | 001b0976afe6f41bff46aa3eaad0285b641a50ea (diff) | |
| parent | 26cd160cb15635afd1c2937a3c15cfb256758323 (diff) | |
| download | git-afbfcaa98396de66e42dc3c845f396c5ba508ced.tar.gz git-afbfcaa98396de66e42dc3c845f396c5ba508ced.tar.xz | |
Merge branch 'rr/rebase-reflog-message-reword'
"git rebase [-i]" used to leave just "rebase" as its reflog message
for some operations. This rewords them to be more informative.
* rr/rebase-reflog-message-reword:
rebase -i: use a better reflog message
rebase: use a better reflog message
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 8a6ec039f..49ccb38f8 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -926,6 +926,21 @@ 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 && |