Re: [RFC/PATCH] status: suggest 'git merge --abort' when appropriate
From: Junio C Hamano <hidden>
Date: 2016-07-22 17:20:13
Matthieu Moy [off-list ref] writes:
We already suggest 'git rebase --abort' during a conflicted rebase. Similarly, suggest 'git merge --abort' during conflict resolution on 'git merge'. Signed-off-by: Matthieu Moy <redacted> ---
It wasn't immediately obvious without the context that the changed code will trigger only during a merge, and not just any other case where we have unmerged index entries. show_merge_in_progress() is only called when s.merge_in_progress is set, which in turn is set only when MERGE_HEAD is there, so we are good here. Will apply; thanks.
quoted hunk
t/t7060-wtstatus.sh | 4 ++++ t/t7512-status-help.sh | 1 + wt-status.c | 7 +++++-- 3 files changed, 10 insertions(+), 2 deletions(-)diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 44bf1d8..4d17363 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh@@ -34,6 +34,7 @@ test_expect_success 'M/D conflict does not segfault' ' On branch side You have unmerged paths. (fix conflicts and run "git commit") + (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution)@@ -138,6 +139,7 @@ test_expect_success 'status when conflicts with add and rm advice (deleted by th On branch master You have unmerged paths. (fix conflicts and run "git commit") + (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution)@@ -171,6 +173,7 @@ test_expect_success 'status when conflicts with add and rm advice (both deleted) On branch conflict_second You have unmerged paths. (fix conflicts and run "git commit") + (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution)@@ -195,6 +198,7 @@ test_expect_success 'status when conflicts with only rm advice (both deleted)' ' On branch conflict_second You have unmerged paths. (fix conflicts and run "git commit") + (use "git merge --abort" to abort the merge) Changes to be committed:diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 49d19a3..5c3db65 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh@@ -29,6 +29,7 @@ test_expect_success 'status when conflicts unresolved' ' On branch conflicts You have unmerged paths. (fix conflicts and run "git commit") + (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add <file>..." to mark resolution)diff --git a/wt-status.c b/wt-status.c index de62ab2..1f21b6a 100644 --- a/wt-status.c +++ b/wt-status.c@@ -948,9 +948,12 @@ static void show_merge_in_progress(struct wt_status *s, { if (has_unmerged(s)) { status_printf_ln(s, color, _("You have unmerged paths.")); - if (s->hints) + if (s->hints) { status_printf_ln(s, color, - _(" (fix conflicts and run \"git commit\")")); + _(" (fix conflicts and run \"git commit\")")); + status_printf_ln(s, color, + _(" (use \"git merge --abort\" to abort the merge)")); + } } else { s-> commitable = 1; status_printf_ln(s, color,