wt-status: give better advice when cherry-pick is in progress
When cherry-pick is in progress, 'git status' gives the advice to run "git commit" to finish the cherry-pick. However, this won't continue the sequencer, when picking a range of commits. Advise users to run "git cherry-pick --continue/--abort"; they work when picking a single commit as well. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Thielow committed
Jun 17, 2013 at 06:28 UTC
b95e66f507967fdfbf7275a94729fe09aa4b20ca
2 files changed
+8
-4
t/t7512-status-help.sh
+4
-2
@@ -632,7 +632,8 @@ test_expect_success 'status when cherry-picking before resolving conflicts' '
632
cat >expected <<-\EOF &&
633
# On branch cherry_branch
634
# You are currently cherry-picking.
635
- # (fix conflicts and run "git commit")
635
+ # (fix conflicts and run "git cherry-pick --continue")
636
+ # (use "git cherry-pick --abort" to cancel the cherry-pick operation)
637
#
638
# Unmerged paths:
639
# (use "git add <file>..." to mark resolution)
@@ -655,7 +656,8 @@ test_expect_success 'status when cherry-picking after resolving conflicts' '
656
cat >expected <<-\EOF &&
657
# On branch cherry_branch
658
# You are currently cherry-picking.
658
- # (all conflicts fixed: run "git commit")
659
+ # (all conflicts fixed: run "git cherry-pick --continue")
660
+ # (use "git cherry-pick --abort" to cancel the cherry-pick operation)
661
#
662
# Changes to be committed:
663
#
wt-status.c
+4
-2
@@ -955,10 +955,12 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
955
if (advice_status_hints) {
956
if (has_unmerged(s))
957
status_printf_ln(s, color,
958
- _(" (fix conflicts and run \"git commit\")"));
958
+ _(" (fix conflicts and run \"git cherry-pick --continue\")"));
959
else
960
status_printf_ln(s, color,
961
- _(" (all conflicts fixed: run \"git commit\")"));
961
+ _(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
962
+ status_printf_ln(s, color,
963
+ _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
964
}
965
wt_status_print_trailer(s);
966
}