From: Carlo Marcelo Arenas Belon Date: Sun, 25 Jul 2010 12:54:30 GMT Subject: [PATCH v2] revert: only suggest to commit if not passing -n Message-ID: <1280062470-21891-1-git-send-email-carenas@sajinet.com.pe> In-Reply-To: <20100723164218.GA2284@localhost.localdomain> while doing revert or cherry-pick, if the automatic merge fails and the user specifically suggested he didn't want to commit, then don't suggest to do that as part of the conflict resolution. Signed-off-by: Carlo Marcelo Arenas Belon --- builtin/revert.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index 8b9d829..b7cb69b 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -250,14 +250,18 @@ static char *help_msg(void) return msg; strbuf_addstr(&helpbuf, " After resolving the conflicts,\n" - "mark the corrected paths with 'git add ' or 'git rm '\n" - "and commit the result"); + "mark the corrected paths with 'git add ' or 'git rm '"); + if (!no_commit) { + strbuf_addstr(&helpbuf, "\nand commit the result"); - if (action == CHERRY_PICK) { - strbuf_addf(&helpbuf, " with: \n" - "\n" - " git commit -c %s\n", - sha1_to_hex(commit->object.sha1)); + if (action == CHERRY_PICK) { + strbuf_addf(&helpbuf, " with: \n" + "\n" + " git commit -c %s\n", + sha1_to_hex(commit->object.sha1)); + } + else + strbuf_addch(&helpbuf, '.'); } else strbuf_addch(&helpbuf, '.'); -- 1.7.2