---
t/t7512-status-help.sh | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 88 insertions(+)
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 4dd201a..dff912b 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -856,4 +856,92 @@ EOF
test_i18ncmp expected actual
'
+test_expect_success 'prepare for different number of commits rebased' '
+ git reset --hard master &&
+ git checkout -b several_commits &&
+ test_commit one_commit main.txt one &&
+ test_commit two_commit main.txt two &&
+ test_commit three_commit main.txt three &&
+ test_commit four_commit main.txt four
+'
+
+
+test_expect_success 'status: one command done nothing remaining' '
+ FAKE_LINES=" exec_exit_15" &&
+ export FAKE_LINES &&
+ test_when_finished "git rebase --abort" &&
+ ONTO=$(git rev-parse --short HEAD~3) &&
+ (git rebase -i HEAD~3 || true)&&
+ cat >expected <<EOF &&
+interactive rebase in progress; onto $ONTO
+Last command(s) done (1 command(s) done):
+ exec exit 15
+No command remaining.
+You are currently editing a commit while rebasing branch
'\''several_commits'\'' on '\''$ONTO'\''.
+ (use "git commit --amend" to amend the current commit)
+ (use "git rebase --continue" once you are satisfied with your changes)
+
+nothing to commit (use -u to show untracked files)
+EOF
+ git status --untracked-files=no >actual &&
+ test_i18ncmp expected actual
+'
+
+test_expect_success 'status: two commands done, two remainings' '
+ FAKE_LINES="1 exec_exit_15 2 3" &&
+ export FAKE_LINES &&
+ test_when_finished "git rebase --abort" &&
+ ONTO=$(git rev-parse --short HEAD~3) &&
+ COMMIT4=$(git rev-parse HEAD) &&
+ COMMIT3=$(git rev-parse HEAD^) &&
+ COMMIT2=$(git rev-parse HEAD^^) &&
+ (git rebase -i HEAD~3 || true)&&
+ cat >expected <<EOF &&
+interactive rebase in progress; onto $ONTO
+Last command(s) done (2 command(s) done):
+ pick $COMMIT2 two_commit
+ exec exit 15
+Next command(s) to do (2 remaining command(s)):
+ pick $COMMIT3 three_commit
+ pick $COMMIT4 four_commit
+ (use git rebase --edit-todo to view and edit)
+You are currently editing a commit while rebasing branch
'\''several_commits'\'' on '\''$ONTO'\''.
+ (use "git commit --amend" to amend the current commit)
+ (use "git rebase --continue" once you are satisfied with your changes)
+
+nothing to commit (use -u to show untracked files)
+EOF
+ git status --untracked-files=no >actual &&
+ test_i18ncmp expected actual
+'
+
+test_expect_success 'status: more than two commands done, two remainings' '
+ FAKE_LINES="1 2 exec_exit_15 3 4" &&
+ export FAKE_LINES &&
+ test_when_finished "git rebase --abort" &&
+ ONTO=$(git rev-parse --short HEAD~4) &&
+ COMMIT4=$(git rev-parse HEAD) &&
+ COMMIT3=$(git rev-parse HEAD^) &&
+ COMMIT2=$(git rev-parse HEAD^^) &&
+ (git rebase -i HEAD~4 || true)&&
+ cat >expected <<EOF &&
+interactive rebase in progress; onto $ONTO
+Last command(s) done (3 command(s) done):
+ pick $COMMIT2 two_commit
+ exec exit 15
+ (see more at .git/rebase-merge/done)
+Next command(s) to do (2 remaining command(s)):
+ pick $COMMIT3 three_commit
+ pick $COMMIT4 four_commit
+ (use git rebase --edit-todo to view and edit)
+You are currently editing a commit while rebasing branch
'\''several_commits'\'' on '\''$ONTO'\''.
+ (use "git commit --amend" to amend the current commit)
+ (use "git rebase --continue" once you are satisfied with your changes)
+
+nothing to commit (use -u to show untracked files)
+EOF
+ git status --untracked-files=no >actual &&
+ test_i18ncmp expected actual
+'
+
test_done
--
2.4.2.342.g3cebd9b
--
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
