From: Matthieu Moy <Matthieu.Moy@xxxxxxx>
The "splitting a commit" is a sub-case of the "rebase" case, hence,
mention rebase like this:
# You are currently splitting a commit during a rebase.
This makes the message consistant with "editing a commit":
# You are currently editing a commit during a rebase.
Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxx>
---
t/t7512-status-help.sh | 8 ++++----
wt-status.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 3ce384a..b3f6eb9 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -210,7 +210,7 @@ test_expect_success 'status when splitting a commit' '
git reset HEAD^ &&
cat >expected <<-\EOF &&
# Not currently on any branch.
- # You are currently splitting a commit.
+ # You are currently splitting a commit during a rebase.
# (Once your working directory is clean, run "git rebase --continue")
#
# Changes not staged for commit:
@@ -290,7 +290,7 @@ test_expect_success 'status: (continue first edit) second edit and split' '
git reset HEAD^ &&
cat >expected <<-\EOF &&
# Not currently on any branch.
- # You are currently splitting a commit.
+ # You are currently splitting a commit during a rebase.
# (Once your working directory is clean, run "git rebase --continue")
#
# Changes not staged for commit:
@@ -359,7 +359,7 @@ test_expect_success 'status: (amend first edit) second edit and split' '
git reset HEAD^ &&
cat >expected <<-\EOF &&
# Not currently on any branch.
- # You are currently splitting a commit.
+ # You are currently splitting a commit during a rebase.
# (Once your working directory is clean, run "git rebase --continue")
#
# Changes not staged for commit:
@@ -433,7 +433,7 @@ test_expect_success 'status: (split first edit) second edit and split' '
git reset HEAD^ &&
cat >expected <<-\EOF &&
# Not currently on any branch.
- # You are currently splitting a commit.
+ # You are currently splitting a commit during a rebase.
# (Once your working directory is clean, run "git rebase --continue")
#
# Changes not staged for commit:
diff --git a/wt-status.c b/wt-status.c
index e65716d..c749267 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -886,7 +886,7 @@ static void show_rebase_in_progress(struct wt_status *s,
status_printf_ln(s, color,
_(" (all conflicts fixed: run \"git rebase --continue\")"));
} else if (split_commit_in_progress(s)) {
- status_printf_ln(s, color, _("You are currently splitting a commit."));
+ status_printf_ln(s, color, _("You are currently splitting a commit during a rebase."));
if (advice_status_hints)
status_printf_ln(s, color,
_(" (Once your working directory is clean, run \"git rebase --continue\")"));
--
1.7.11.rc0.57.g84a04c7
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html