# [PATCH] revert: only suggest to commit if not passing -n 4 messages from 2010-07-22 to 2010-08-13. Participants: Carlo Marcelo Arenas Belon, Jared Hance, Junio C Hamano. Thread: https://gitlist.dev/t/24468 ## Carlo Marcelo Arenas Belon, 2010-07-22 13:51 Subject: [PATCH] revert: only suggest to commit if not passing -n Message-ID: <1279806692-6762-1-git-send-email-carenas@sajinet.com.pe> URL: https://gitlist.dev/e/1279806692-6762-1-git-send-email-carenas%40sajinet.com.pe ``` 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..72d0753 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_addf(&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.1.1 ``` ## Jared Hance, 2010-07-23 16:42 Subject: Re: [PATCH] revert: only suggest to commit if not passing -n Message-ID: <20100723164218.GA2284@localhost.localdomain> URL: https://gitlist.dev/e/20100723164218.GA2284%40localhost.localdomain In-Reply-To: <1279806692-6762-1-git-send-email-carenas@sajinet.com.pe> ``` On Thu, Jul 22, 2010 at 06:51:32AM -0700, Carlo Marcelo Arenas Belon wrote: > 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_addf(&helpbuf, "\nand commit the result"); Shouldn't we use strbuf_addstr here? We aren't using the formatting part of strbuf_addf. ``` ## Carlo Marcelo Arenas Belon, 2010-07-25 12:54 Subject: [PATCH v2] revert: only suggest to commit if not passing -n Message-ID: <1280062470-21891-1-git-send-email-carenas@sajinet.com.pe> URL: https://gitlist.dev/e/1280062470-21891-1-git-send-email-carenas%40sajinet.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 ``` ## Junio C Hamano, 2010-08-13 04:54 Subject: Re: [PATCH v2] revert: only suggest to commit if not passing -n Message-ID: <7vvd7fkt7y.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vvd7fkt7y.fsf%40alter.siamese.dyndns.org In-Reply-To: <1280062470-21891-1-git-send-email-carenas@sajinet.com.pe> ``` Carlo Marcelo Arenas Belon writes: > 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. I agree that the suggestion does not make sense, but realistically, when the user said git cherry-pick --no-commit $something we have no idea if the user wants to add or remove once the conflict has been resolved. More often than not, "cherry-pick --no-commit" is followed by further edit, at least in the use cases I've seen, so "git add/rm" is not the first command the user will run after resolving the conflicts. So it _might_ make sense not to even suggest "add/rm" in that case. After all, this is a help/advice message, and "cherry-pick --no-commit" is sort of an advanced feature anyway, so... > 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 ```