summaryrefslogtreecommitdiff
path: root/builtin/revert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-19 17:49:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-19 17:49:05 (GMT)
commit541b9cf1463334b1984a0b78a7180246415cb477 (patch)
treedca0ebe9f75365e4b35ea44488dca0010afd0496 /builtin/revert.c
parent2201cc8c977918c520e70093f4b74bbdf70afcc5 (diff)
parent278f7e6f6dc1b515f192daf836fe75d733435774 (diff)
downloadgit-541b9cf1463334b1984a0b78a7180246415cb477.zip
git-541b9cf1463334b1984a0b78a7180246415cb477.tar.gz
git-541b9cf1463334b1984a0b78a7180246415cb477.tar.bz2
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
Diffstat (limited to 'builtin/revert.c')
-rw-r--r--builtin/revert.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index 010508d..87df70e 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -302,7 +302,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");
@@ -317,9 +317,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)
@@ -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, ")\n");
}
- if (!opts->no_commit)
- write_cherry_pick_head(commit);
}
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);
}
+ /*
+ * 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)