sequencer: offer helpful advice when a command was rescheduled

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 3ac7ebf85f3198cde56f784456e0024205aec853..c0ef946811dd534dfa5e704c992b6ab1fab82c35 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -6,6 +6,7 @@
 test_description='git branch assorted tests'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-rebase.sh
 
 test_expect_success 'prepare a trivial repository' '
        echo Hello >A &&
@@ -117,6 +118,16 @@ test_expect_success 'git branch -m bbb should rename checked out branch' '
        test_cmp expect actual
 '
 
+test_expect_success 'renaming checked out branch works with d/f conflict' '
+       test_when_finished "git branch -D foo/bar || git branch -D foo" &&
+       test_when_finished git checkout master &&
+       git checkout -b foo &&
+       git branch -m foo/bar &&
+       git symbolic-ref HEAD >actual &&
+       echo refs/heads/foo/bar >expect &&
+       test_cmp expect actual
+'
+
 test_expect_success 'git branch -m o/o o should fail when o/p exists' '
        git branch o/o &&
        git branch o/p &&
@@ -518,7 +529,7 @@ test_expect_success 'git branch -c -f o/q o/p should work when o/p exists' '
        git branch -c -f o/q o/p
 '
 
-test_expect_success 'git branch -c qq rr/qq should fail when r exists' '
+test_expect_success 'git branch -c qq rr/qq should fail when rr exists' '
        git branch qq &&
        git branch rr &&
        test_must_fail git branch -c qq rr/qq
@@ -1236,6 +1247,29 @@ test_expect_success '--merged is incompatible with --no-merged' '
        test_must_fail git branch --merged HEAD --no-merged HEAD
 '
 
+test_expect_success '--list during rebase' '
+       test_when_finished "reset_rebase" &&
+       git checkout master &&
+       FAKE_LINES="1 edit 2" &&
+       export FAKE_LINES &&
+       set_fake_editor &&
+       git rebase -i HEAD~2 &&
+       git branch --list >actual &&
+       test_i18ngrep "rebasing master" actual
+'
+
+test_expect_success '--list during rebase from detached HEAD' '
+       test_when_finished "reset_rebase && git checkout master" &&
+       git checkout master^0 &&
+       oid=$(git rev-parse --short HEAD) &&
+       FAKE_LINES="1 edit 2" &&
+       export FAKE_LINES &&
+       set_fake_editor &&
+       git rebase -i HEAD~2 &&
+       git branch --list >actual &&
+       test_i18ngrep "rebasing detached HEAD $oid" actual
+'
+
 test_expect_success 'tracking with unexpected .fetch refspec' '
        rm -rf a b c d &&
        git init a &&