From 3b2c5b6df4be14cac6b36cf0db0468efa1f42916 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 14 Jul 2010 01:28:14 +0200 Subject: [PATCH] revert: don't print "Finished one cherry-pick." if commit failed Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- builtin/revert.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index b84b5b864..ec931bdcf 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -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) -- 2.26.2