cherry-pick: do not give irrelevant advice when cherry-pick punted

If a cherry-pick did not even start because the working tree had local
changes that would overlap with the operation, we shouldn't be advising
the users to resolve conflicts nor to conclude it with "git commit".

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/revert.c b/builtin/revert.c
index 5f9fa44db4a6316d37f77846404c0ab3ee843953..e38fe0ce7ad2702c4a6edae262635c4f638ffcb6 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -223,7 +223,7 @@ static void advise(const char *advice, ...)
        va_end(params);
 }
 
        va_end(params);
 }
 

-static void print_advice(void)
+static void print_advice(int show_hint)

 {
        char *msg = getenv("GIT_CHERRY_PICK_HELP");
 
 {
        char *msg = getenv("GIT_CHERRY_PICK_HELP");
 


@@ -238,9 +238,11 @@ static void print_advice(void)
                return;
        }
 
                return;
        }
 

-       advise("after resolving the conflicts, mark the corrected paths");
-       advise("with 'git add <paths>' or 'git rm <paths>'");
-       advise("and commit the result with 'git commit'");
+       if (show_hint) {
+               advise("after resolving the conflicts, mark the corrected paths");
+               advise("with 'git add <paths>' or 'git rm <paths>'");
+               advise("and commit the result with 'git commit'");
+       }

 }
 
 static void write_message(struct strbuf *msgbuf, const char *filename)
 }
 
 static void write_message(struct strbuf *msgbuf, const char *filename)


@@ -516,7 +518,7 @@ static int do_pick_commit(void)
                      : _("could not apply %s... %s"),
                      find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
                      msg.subject);
                      : _("could not apply %s... %s"),
                      find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
                      msg.subject);

-               print_advice();
+               print_advice(res == 1);

                rerere(allow_rerere_auto);
        } else {
                if (!no_commit)
                rerere(allow_rerere_auto);
        } else {
                if (!no_commit)