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

Re: [PATCH] fixup! graph: output padding for merge subsequent parents

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 11, 2013, 19:58 UTC
Message-ID
<7va9ramxlr.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130211190629.GC2270@serenity.lan>
John Keeping <john@keeping.me.uk> writes:
Show 19 quoted lines
> On Mon, Feb 11, 2013 at 08:42:21AM -0800, Junio C Hamano wrote:
>> John Keeping <john@keeping.me.uk> writes:
>> 
>> > Perhaps it's best to leave the patch as it originally was to guarantee
>> > that we can't get stuck in graph_show_commit(), even when it's called at
>> > an unexpected time, but I see you've already squashed this change in.
>> >
>> > Would you prefer me to resend the original patch or send an update with
>> > this change and the above reasoning in the commit message?
>> 
>> Yes, please.  Let's have the original (I think I have it in my
>> reflog so no need to resend it) and this update on top as a separate
>> patch with an updated log message.
>
> I was suggesting dropping the change to remove the
> graph_is_commit_finished() check in the loop.  I'm not sure it buys us
> much and there are still situations that could result in the state
> changing to PADDING during the loop if the graph API is used in an
> unexpected way.

OK, so the fixup! was not done with enough thought. I am fine with dropping it.

Thanks.
Previous: John KeepingNext: Matthieu Moy
Message 9 of 11 in “What's cooking in git.git (Feb 2013, #04; Sat, 9)”
  1. Junio C HamanoFeb 9, 2013
  2. fixup! graph: output padding for merge subsequent parentsJohn Keeping, Feb 10, 2013
  3. Junio C HamanoFeb 10, 2013
  4. John KeepingFeb 10, 2013
  5. Junio C HamanoFeb 10, 2013
  6. John KeepingFeb 11, 2013
  7. Junio C HamanoFeb 11, 2013
  8. John KeepingFeb 11, 2013
  9. Junio C HamanoFeb 11, 2013
  10. Matthieu MoyFeb 11, 2013
  11. Junio C HamanoFeb 11, 2013

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.