From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [RFC] sequencer: allow metadata to be saved if using cherry-pick --no-commit
Date: Wed, 21 Oct 2020 12:04:52 -0600 [thread overview]
Message-ID: <CAOc6etawWz526w-NPU00bvwRt5_dnZEq0Gk0L_2N3NPG3tAGYA@mail.gmail.com> (raw)
In-Reply-To: <20201021161242.GA111581@nand.local>
I think my previous reply was rejected so let me try again (I
apologize if you get a duplicate):
On Wed, Oct 21, 2020 at 10:12 AM Taylor Blau <me@ttaylorr.com> wrote:
> Hmm. I'm a little confused after reading your patch below. Why does (res
> == 0) change to (res == 0 && opts->no_commit)? Wouldn't we still want to
> update our CHERRY_PICK_HEAD even if "res == 0 && !opts->no_commit"?
My _guess_ (haven't sat down to study the code that much) is that if
"res == 0 && !opts->no_commit", then commit will wrap up in a normal
fashion and then there's actually no need for this file to be updated.
You can see that the same thing is done when reverting (preexisting
code), a few lines after where the patch is applied (if I remember
correctly).
>
> Even still, this patch as it is seems to fail a number of tests. You can
> run the tests yourself by running "make && make test", and there is more
> information about that in t/README.
Will actually look at that just so that I can have a better idea of
what the _current_ behavior is expected from using the flag. Looking
forward to more comments
>
> Thanks,
> Taylor
Thank you!
next prev parent reply other threads:[~2020-10-21 18:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 6:24 [RFC] sequencer: allow metadata to be saved if using cherry-pick --no-commit Edmundo Carmona Antoranz
2020-10-21 6:31 ` Edmundo Carmona Antoranz
2020-10-21 16:12 ` Taylor Blau
2020-10-21 18:04 ` Edmundo Carmona Antoranz [this message]
2020-10-21 19:46 ` Junio C Hamano
2020-10-21 20:41 ` Junio C Hamano
2020-10-21 20:45 ` Edmundo Carmona Antoranz
2020-10-21 20:53 ` Edmundo Carmona Antoranz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAOc6etawWz526w-NPU00bvwRt5_dnZEq0Gk0L_2N3NPG3tAGYA@mail.gmail.com \
--to=eantoranz@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).