[PATCH 3/4] revert: don't print "Finished one cherry-pick." if commit failed
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/revert.c | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index b84b5b8..ec931bd 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)
--
1.7.2.rc1.215.g2dff2.dirty
Christian Couder <chriscool@tuxfamily.org>