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

Re: [PATCH 2/2] Teach commit about CHERRY_PICK_HEAD

From
Jay Soffian <jaysoffian@gmail.com>
Date
Feb 16, 2011, 21:33 UTC
Message-ID
<AANLkTi=YF51i41St6B=ZpdBYm5MRoMStea+i7TrYTtfF@mail.gmail.com>
In-Reply-To
<7vpqqrit8r.fsf@alter.siamese.dyndns.org>
On Wed, Feb 16, 2011 at 4:07 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 8 quoted lines
> Jay Soffian <jaysoffian@gmail.com> writes:
>
>> If the user wishes to reset authorship, that must now be done explicitly
>> via --reset-author.
>
> This is not a new requirement, is it?  Even "commit -c $that_commit"
> before the previous "commit -c CHERRY_PICK_HEAD" does use the original,
> no?

It is a new requirement for when the user does a bare "commit" _and_ CHERRY_PICK_HEAD exists.

Normally a bare "commit" creates new authorship, but when CHERRY_PICK_HEAD exists, authorship is taken from CHERRY_PICK_HEAD commit unless --reset-author is specified.

> I think the changed code is _MUCH_ easier to follow compared to the
> previous round; the only thing the reader needs to keep in mind is that
> the most of the change essentially is "s/in_merge/whence != FROM_COMMIT/"
> and making that work.
I think I was trying to be too clever in the previous round.
>> * We remove a unused import from revert.c
>
> Micronit: s/import/include/.
Okay.
> So I think the above is the right thing to do, but we probably need a bit
> of in-code comment to describe why we say "whence != FROM_MERGE" here.

Will do. It took me several tries to understand what that code block was trying to do, so a comment will certainly help future readers.

Thanks,
j.
Previous: Junio C HamanoNext: Jonathan Nieder
Message 14 of 18 in “CHERRY_PICK_HEAD”
  1. 0/2 CHERRY_PICK_HEADJay Soffian, Feb 16, 2011
  2. 1/2 Introduce CHERRY_PICK_HEADJay Soffian, Feb 16, 2011
  3. Nguyen Thai Ngoc DuyFeb 16, 2011
  4. Jay SoffianFeb 16, 2011
  5. Introduce CHERRY_PICK_HEADJay Soffian, Feb 16, 2011
  6. Jay SoffianFeb 16, 2011
  7. Jonathan NiederFeb 16, 2011
  8. Jay SoffianFeb 16, 2011
  9. Jonathan NiederFeb 16, 2011
  10. Junio C HamanoFeb 17, 2011
  11. Jonathan NiederFeb 17, 2011
  12. 2/2 Teach commit about CHERRY_PICK_HEADJay Soffian, Feb 16, 2011
  13. Junio C HamanoFeb 16, 2011
  14. Jay SoffianFeb 16, 2011
  15. 5/2 bash: teach __git_ps1 about CHERRY_PICK_HEADJonathan Nieder, Feb 16, 2011
  16. Junio C HamanoFeb 16, 2011
  17. Jonathan NiederFeb 16, 2011
  18. Jay SoffianFeb 17, 2011

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.