status: mention --skip for revert and cherry-pick

When reverting or cherry-picking, one of the options we can pass the
sequencer is `--skip`. However, unlike rebasing, `--skip` is not
mentioned as a possible option in the status message. Mention it so that
users are more aware of their options.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index e01c285cbf8fdaa511240858f9f43165d149bc7e..66d7a627972615f86e805dbc52a178e36fd12616 100755 (executable)
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -733,6 +733,7 @@ test_expect_success 'status when cherry-picking before resolving conflicts' '
 On branch cherry_branch
 You are currently cherry-picking commit $TO_CHERRY_PICK.
   (fix conflicts and run "git cherry-pick --continue")
 On branch cherry_branch
 You are currently cherry-picking commit $TO_CHERRY_PICK.
   (fix conflicts and run "git cherry-pick --continue")

+  (use "git cherry-pick --skip" to skip this patch)

   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
 Unmerged paths:
   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
 Unmerged paths:


@@ -757,6 +758,7 @@ test_expect_success 'status when cherry-picking after resolving conflicts' '
 On branch cherry_branch
 You are currently cherry-picking commit $TO_CHERRY_PICK.
   (all conflicts fixed: run "git cherry-pick --continue")
 On branch cherry_branch
 You are currently cherry-picking commit $TO_CHERRY_PICK.
   (all conflicts fixed: run "git cherry-pick --continue")

+  (use "git cherry-pick --skip" to skip this patch)

   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
 Changes to be committed:
   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
 Changes to be committed:


@@ -778,6 +780,7 @@ test_expect_success 'status when cherry-picking after committing conflict resolu
 On branch cherry_branch
 Cherry-pick currently in progress.
   (run "git cherry-pick --continue" to continue)
 On branch cherry_branch
 Cherry-pick currently in progress.
   (run "git cherry-pick --continue" to continue)

+  (use "git cherry-pick --skip" to skip this patch)

   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
 nothing to commit (use -u to show untracked files)
   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 
 nothing to commit (use -u to show untracked files)


@@ -835,6 +838,7 @@ test_expect_success 'status while reverting commit (conflicts)' '
 On branch master
 You are currently reverting commit $TO_REVERT.
   (fix conflicts and run "git revert --continue")
 On branch master
 You are currently reverting commit $TO_REVERT.
   (fix conflicts and run "git revert --continue")

+  (use "git revert --skip" to skip this patch)

   (use "git revert --abort" to cancel the revert operation)
 
 Unmerged paths:
   (use "git revert --abort" to cancel the revert operation)
 
 Unmerged paths:


@@ -855,6 +859,7 @@ test_expect_success 'status while reverting commit (conflicts resolved)' '
 On branch master
 You are currently reverting commit $TO_REVERT.
   (all conflicts fixed: run "git revert --continue")
 On branch master
 You are currently reverting commit $TO_REVERT.
   (all conflicts fixed: run "git revert --continue")

+  (use "git revert --skip" to skip this patch)

   (use "git revert --abort" to cancel the revert operation)
 
 Changes to be committed:
   (use "git revert --abort" to cancel the revert operation)
 
 Changes to be committed:


@@ -887,6 +892,7 @@ test_expect_success 'status while reverting after committing conflict resolution
 On branch master
 Revert currently in progress.
   (run "git revert --continue" to continue)
 On branch master
 Revert currently in progress.
   (run "git revert --continue" to continue)

+  (use "git revert --skip" to skip this patch)

   (use "git revert --abort" to cancel the revert operation)
 
 nothing to commit (use -u to show untracked files)
   (use "git revert --abort" to cancel the revert operation)
 
 nothing to commit (use -u to show untracked files)

diff --git a/wt-status.c b/wt-status.c
index 9f6c65a5809754717f8c51f809eae78f435bcd12..ad6282c7f86884aab0722457844ed391dbe71059 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1433,6 +1433,8 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
                else
                        status_printf_ln(s, color,
                                _("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
                else
                        status_printf_ln(s, color,
                                _("  (all conflicts fixed: run \"git cherry-pick --continue\")"));

+               status_printf_ln(s, color,
+                       _("  (use \"git cherry-pick --skip\" to skip this patch)"));

                status_printf_ln(s, color,
                        _("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
        }
                status_printf_ln(s, color,
                        _("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
        }


@@ -1460,6 +1462,8 @@ static void show_revert_in_progress(struct wt_status *s,
                else
                        status_printf_ln(s, color,
                                _("  (all conflicts fixed: run \"git revert --continue\")"));
                else
                        status_printf_ln(s, color,
                                _("  (all conflicts fixed: run \"git revert --continue\")"));

+               status_printf_ln(s, color,
+                       _("  (use \"git revert --skip\" to skip this patch)"));

                status_printf_ln(s, color,
                        _("  (use \"git revert --abort\" to cancel the revert operation)"));
        }
                status_printf_ln(s, color,
                        _("  (use \"git revert --abort\" to cancel the revert operation)"));
        }