kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'js/no-cherry-pick-head-after-punted' 

* js/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
maint
Junio C Hamano 2011-10-19 10:49:05 -07:00
parent 2201cc8c97 278f7e6f6d
commit 541b9cf146
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/revert.c
View File

@ -302,7 +302,7 @@ static void write_cherry_pick_head(struct commit *commit)
strbuf_release(&buf); strbuf_release(&buf);
} }


static void print_advice(void) static void print_advice(int show_hint)
{ {
char *msg = getenv("GIT_CHERRY_PICK_HELP"); char *msg = getenv("GIT_CHERRY_PICK_HELP");


@ -317,10 +317,12 @@ static void print_advice(void)
return; return;
} }


if (show_hint) {
advise("after resolving the conflicts, mark the corrected paths"); advise("after resolving the conflicts, mark the corrected paths");
advise("with 'git add <paths>' or 'git rm <paths>'"); advise("with 'git add <paths>' or 'git rm <paths>'");
advise("and commit the result with 'git commit'"); advise("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)
{ {
@ -564,8 +566,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, sha1_to_hex(commit->object.sha1));
strbuf_addstr(&msgbuf, ")\n"); strbuf_addstr(&msgbuf, ")\n");
} }
if (!opts->no_commit)
write_cherry_pick_head(commit);
} }


if (!opts->strategy || !strcmp(opts->strategy, "recursive") || opts->action == REVERT) { if (!opts->strategy || !strcmp(opts->strategy, "recursive") || opts->action == REVERT) {
@ -586,13 +586,22 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
free_commit_list(remotes); 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) { if (res) {
error(opts->action == REVERT error(opts->action == REVERT
? _("could not revert %s... %s") ? _("could not revert %s... %s")
: _("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(); print_advice(res == 1);
rerere(opts->allow_rerere_auto); rerere(opts->allow_rerere_auto);
} else { } else {
if (!opts->no_commit) if (!opts->no_commit)

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

@ -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_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' ' test_expect_success 'GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD' '
pristine_detach initial && pristine_detach initial &&
( (