mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted
* js/maint-no-cherry-pick-head-after-punted: cherry-pick: do not give irrelevant advice when cherry-pick punted revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so Conflicts: builtin/revert.c
This commit is contained in:
commit
278f7e6f6d
|
@ -304,7 +304,7 @@ static void write_cherry_pick_head(struct commit *commit)
|
|||
strbuf_release(&buf);
|
||||
}
|
||||
|
||||
static void print_advice(void)
|
||||
static void print_advice(int show_hint)
|
||||
{
|
||||
char *msg = getenv("GIT_CHERRY_PICK_HELP");
|
||||
|
||||
|
@ -319,9 +319,11 @@ static void print_advice(void)
|
|||
return;
|
||||
}
|
||||
|
||||
advise("after resolving the conflicts, mark the corrected paths");
|
||||
advise("with 'git add <paths>' or 'git rm <paths>'");
|
||||
advise("and commit the result with 'git commit'");
|
||||
if (show_hint) {
|
||||
advise("after resolving the conflicts, mark the corrected paths");
|
||||
advise("with 'git add <paths>' or 'git rm <paths>'");
|
||||
advise("and commit the result with 'git commit'");
|
||||
}
|
||||
}
|
||||
|
||||
static void write_message(struct strbuf *msgbuf, const char *filename)
|
||||
|
@ -566,8 +568,6 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
|
|||
strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1));
|
||||
strbuf_addstr(&msgbuf, ")\n");
|
||||
}
|
||||
if (!opts->no_commit)
|
||||
write_cherry_pick_head(commit);
|
||||
}
|
||||
|
||||
if (!opts->strategy || !strcmp(opts->strategy, "recursive") || opts->action == REVERT) {
|
||||
|
@ -588,13 +588,22 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
|
|||
free_commit_list(remotes);
|
||||
}
|
||||
|
||||
/*
|
||||
* If the merge was clean or if it failed due to conflict, we write
|
||||
* CHERRY_PICK_HEAD for the subsequent invocation of commit to use.
|
||||
* However, if the merge did not even start, then we don't want to
|
||||
* write it at all.
|
||||
*/
|
||||
if (opts->action == CHERRY_PICK && !opts->no_commit && (res == 0 || res == 1))
|
||||
write_cherry_pick_head(commit);
|
||||
|
||||
if (res) {
|
||||
error(opts->action == REVERT
|
||||
? _("could not revert %s... %s")
|
||||
: _("could not apply %s... %s"),
|
||||
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
|
||||
msg.subject);
|
||||
print_advice();
|
||||
print_advice(res == 1);
|
||||
rerere(opts->allow_rerere_auto);
|
||||
} else {
|
||||
if (!opts->no_commit)
|
||||
|
|
|
@ -77,6 +77,21 @@ test_expect_success 'cherry-pick --no-commit does not set CHERRY_PICK_HEAD' '
|
|||
test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
|
||||
'
|
||||
|
||||
test_expect_success 'cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD' '
|
||||
pristine_detach initial &&
|
||||
echo foo > foo &&
|
||||
test_must_fail git cherry-pick base &&
|
||||
test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD' '
|
||||
pristine_detach initial &&
|
||||
echo foo > foo &&
|
||||
test_must_fail git cherry-pick --strategy=resolve base &&
|
||||
test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
|
||||
'
|
||||
|
||||
test_expect_success 'GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD' '
|
||||
pristine_detach initial &&
|
||||
(
|
||||
|
|
Loading…
Reference in a new issue