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

Merge branch 'ph/cherry-pick-advice-refinement'

Browse Source 
* ph/cherry-pick-advice-refinement:
  cherry-pick: No advice to commit if --no-commit
This commit is contained in:
Junio C Hamano 2012-02-28 13:26:01 -08:00
commit 4d50dbcda5
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sequencer.c
View File

@ -123,7 +123,7 @@ static void write_cherry_pick_head(struct commit *commit, const char *pseudoref)
strbuf_release(&buf); strbuf_release(&buf);
} }
static void print_advice(int show_hint) static void print_advice(int show_hint, struct replay_opts *opts)
{ {
char *msg = getenv("GIT_CHERRY_PICK_HELP"); char *msg = getenv("GIT_CHERRY_PICK_HELP");
@ -138,10 +138,15 @@ static void print_advice(int show_hint)
return; return;
} }
if (show_hint) if (show_hint) {
advise(_("after resolving the conflicts, mark the corrected paths\n" if (opts->no_commit)
"with 'git add <paths>' or 'git rm <paths>'\n" advise(_("after resolving the conflicts, mark the corrected paths\n"
"and commit the result with 'git commit'")); "with 'git add <paths>' or 'git rm <paths>'"));
else
advise(_("after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"));
}
} }
static void write_message(struct strbuf *msgbuf, const char *filename) static void write_message(struct strbuf *msgbuf, const char *filename)
@ -423,7 +428,7 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
: _("could not apply %s... %s"), : _("could not apply %s... %s"),
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
msg.subject); msg.subject);
print_advice(res == 1); print_advice(res == 1, opts);
rerere(opts->allow_rerere_auto); rerere(opts->allow_rerere_auto);
} else { } else {
if (!opts->no_commit) if (!opts->no_commit)

14
t/t3507-cherry-pick-conflict.sh
View File

@ -59,6 +59,20 @@ test_expect_success 'advice from failed cherry-pick' "
test_i18ncmp expected actual test_i18ncmp expected actual
" "
test_expect_success 'advice from failed cherry-pick --no-commit' "
pristine_detach initial &&
picked=\$(git rev-parse --short picked) &&
cat <<-EOF >expected &&
error: could not apply \$picked... picked
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
EOF
test_must_fail git cherry-pick --no-commit picked 2>actual &&
test_i18ncmp expected actual
"
test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' ' test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
pristine_detach initial && pristine_detach initial &&
test_must_fail git cherry-pick picked && test_must_fail git cherry-pick picked &&