* [PATCH 3/4] revert: don't print "Finished one cherry-pick." if commit failed
@ 2010-07-13 23:28 Christian Couder
2010-07-15 22:42 ` Jonathan Nieder
0 siblings, 1 reply; 2+ messages in thread
From: Christian Couder @ 2010-07-13 23:28 UTC (permalink / raw)
To: Junio C Hamano
Cc: git, Johannes Schindelin, Sverre Rabbelier, Ramkumar Ramachandra,
Jonathan Nieder, Jeff King
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-15 22:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-13 23:28 [PATCH 3/4] revert: don't print "Finished one cherry-pick." if commit failed Christian Couder
2010-07-15 22:42 ` Jonathan Nieder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).