revert: don't print "Finished one cherry-pick." if commit failed
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5df16453d4
commit
3b2c5b6df4
@ -518,24 +518,17 @@ static int do_pick_commit(void)
|
||||
mebuf.buf, help_msg());
|
||||
rerere(allow_rerere_auto);
|
||||
} else {
|
||||
fprintf(stderr, "Finished one %s.\n", mebuf.buf);
|
||||
if (!no_commit)
|
||||
res = run_git_commit(defmsg);
|
||||
if (!res)
|
||||
fprintf(stderr, "Finished one %s.\n", mebuf.buf);
|
||||
}
|
||||
|
||||
strbuf_release(&mebuf);
|
||||
free_message(&msg);
|
||||
|
||||
if (res)
|
||||
return 1;
|
||||
|
||||
if (!no_commit) {
|
||||
res = run_git_commit(defmsg);
|
||||
free(defmsg);
|
||||
return res;
|
||||
}
|
||||
|
||||
free(defmsg);
|
||||
|
||||
return 0;
|
||||
return res;
|
||||
}
|
||||
|
||||
static void prepare_revs(struct rev_info *revs)
|
||||
|
Loading…
Reference in New Issue
Block a user