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

Merge branch 'rt/cherry-pick-continue-advice-in-status'

Browse Source 
* rt/cherry-pick-continue-advice-in-status:
  wt-status: give better advice when cherry-pick is in progress
This commit is contained in:
Junio C Hamano 2013-06-24 13:48:57 -07:00
commit 001d116054
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -632,7 +632,8 @@ test_expect_success 'status when cherry-picking before resolving conflicts' '
cat >expected <<-\EOF &&
# On branch cherry_branch
# You are currently cherry-picking.
# (fix conflicts and run "git commit")
# (fix conflicts and run "git cherry-pick --continue")
# (use "git cherry-pick --abort" to cancel the cherry-pick operation)
#
# Unmerged paths:
# (use "git add <file>..." to mark resolution)
@ -655,7 +656,8 @@ test_expect_success 'status when cherry-picking after resolving conflicts' '
cat >expected <<-\EOF &&
# On branch cherry_branch
# You are currently cherry-picking.
# (all conflicts fixed: run "git commit")
# (all conflicts fixed: run "git cherry-pick --continue")
# (use "git cherry-pick --abort" to cancel the cherry-pick operation)
#
# Changes to be committed:
#

6
wt-status.c
View File

@ -955,10 +955,12 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
if (advice_status_hints) {
if (has_unmerged(s))
status_printf_ln(s, color,
_(" (fix conflicts and run \"git commit\")"));
_(" (fix conflicts and run \"git cherry-pick --continue\")"));
else
status_printf_ln(s, color,
_(" (all conflicts fixed: run \"git commit\")"));
_(" (all conflicts fixed: run \"git cherry-pick --continue\")"));
status_printf_ln(s, color,
_(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
}
wt_status_print_trailer(s);
}