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

revert: don't print "Finished one cherry-pick." if commit failed

Browse Source 
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2010-07-14 01:28:14 +02:00 committed by Junio C Hamano
parent 5df16453d4
commit 3b2c5b6df4
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/revert.c
View File

@ -518,24 +518,17 @@ static int do_pick_commit(void)
mebuf.buf, help_msg()); mebuf.buf, help_msg());
rerere(allow_rerere_auto); rerere(allow_rerere_auto);
} else { } 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); strbuf_release(&mebuf);
free_message(&msg); free_message(&msg);
if (res)
return 1;
if (!no_commit) {
res = run_git_commit(defmsg);
free(defmsg);
return res;
}
free(defmsg); free(defmsg);
return 0; return res;
} }
static void prepare_revs(struct rev_info *revs) static void prepare_revs(struct rev_info *revs)