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>

diff --git a/builtin/revert.c b/builtin/revert.c
index b84b5b8645dce4fee190e7b11a5ac8ec24a994fc..ec931bdcfcc7089753f3a30b914fee74df6d80f5 100644 (file)
--- 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 {
                        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);
        }
 
        strbuf_release(&mebuf);
        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)