undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mm/status-suggest-merge-abort' into maint

Browse Source 
"git status" learned to suggest "merge --abort" during a conflicted
merge, just like it already suggests "rebase --abort" during a
conflicted rebase.

* mm/status-suggest-merge-abort:
  status: suggest 'git merge --abort' when appropriate
This commit is contained in:
Junio C Hamano 2016-08-10 11:55:19 -07:00
commit 61efc5c2d8
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t7060-wtstatus.sh
View File

@ -34,6 +34,7 @@ test_expect_success 'M/D conflict does not segfault' '
On branch side On branch side
You have unmerged paths. You have unmerged paths.
(fix conflicts and run "git commit") (fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths: Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution) (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 On branch master
You have unmerged paths. You have unmerged paths.
(fix conflicts and run "git commit") (fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths: Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution) (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 On branch conflict_second
You have unmerged paths. You have unmerged paths.
(fix conflicts and run "git commit") (fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths: Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution) (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 On branch conflict_second
You have unmerged paths. You have unmerged paths.
(fix conflicts and run "git commit") (fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed: Changes to be committed:

1
t/t7512-status-help.sh
View File

@ -29,6 +29,7 @@ test_expect_success 'status when conflicts unresolved' '
On branch conflicts On branch conflicts
You have unmerged paths. You have unmerged paths.
(fix conflicts and run "git commit") (fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths: Unmerged paths:
(use "git add <file>..." to mark resolution) (use "git add <file>..." to mark resolution)

7
wt-status.c
View File

@ -947,9 +947,12 @@ static void show_merge_in_progress(struct wt_status *s,
{ {
if (has_unmerged(s)) { if (has_unmerged(s)) {
status_printf_ln(s, color, _("You have unmerged paths.")); status_printf_ln(s, color, _("You have unmerged paths."));
if (s->hints) if (s->hints) {
status_printf_ln(s, color, 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 { } else {
s-> commitable = 1; s-> commitable = 1;
status_printf_ln(s, color, status_printf_ln(s, color,