git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC] sequencer: allow metadata to be saved if using cherry-pick --no-commit

From
Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date
Oct 21, 2020, 18:04 UTC
Message-ID
<CAOc6etawWz526w-NPU00bvwRt5_dnZEq0Gk0L_2N3NPG3tAGYA@mail.gmail.com>
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!
Previous: Taylor BlauNext: Junio C Hamano
Message 4 of 8 in “[RFC] sequencer: allow metadata to be saved if using cherry-pick --no-commit”
  1. Edmundo Carmona AntoranzOct 21, 2020
  2. Edmundo Carmona AntoranzOct 21, 2020
  3. Taylor BlauOct 21, 2020
  4. Edmundo Carmona AntoranzOct 21, 2020
  5. Junio C HamanoOct 21, 2020
  6. Junio C HamanoOct 21, 2020
  7. Edmundo Carmona AntoranzOct 21, 2020
  8. Edmundo Carmona AntoranzOct 21, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.