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

Re: [PATCH 1/6] graph: output padding for merge subsequent parents

From
John Keeping <john@keeping.me.uk>
Date
Feb 8, 2013, 19:31 UTC
Message-ID
<20130208193026.GA1024@river>
In-Reply-To
<b98eb2bfe2b022ddf1afbe9f7123accfe068e8c9.1360267849.git.john@keeping.me.uk>

[Moved from the thread where this was initially posted to reply to the series.]

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:
Show 21 quoted lines
> This works, but if we know we're not going to enter the while loop, it
> seams even easier to do this:
> 
> --- a/graph.c
> +++ b/graph.c
> @@ -1227,7 +1227,17 @@ void graph_show_commit(struct git_graph *graph)
>         if (!graph)
>                 return;
>  
> -       while (!shown_commit_line && !graph_is_commit_finished(graph)) {
> +       /*
> +        * When showing a diff of a merge against each of its parents, we
> +        * are called once for each parent without graph_update having been
> +        * called.  In this case, simply output a single padding line.
> +        */
> +       if (graph_is_commit_finished(graph)) {
> +               graph_show_padding(graph);
> +               return;
> +       }
> +
> +       while (!shown_commit_line) {

This looks good to me. I'll amend locally and re-send in a few days after giving others a chance to comment.

John
Previous: John KeepingNext: John Keeping
Message 3 of 9 in “Improve "git log --graph" output of merges”
  1. 0/6 Improve "git log --graph" output of mergesJohn Keeping, Feb 7, 2013
  2. 1/6 graph: output padding for merge subsequent parentsJohn Keeping, Feb 7, 2013
  3. John KeepingFeb 8, 2013
  4. 2/6 diff: write prefix to the correct fileJohn Keeping, Feb 7, 2013
  5. 3/6 diff.c: make constant string arguments constJohn Keeping, Feb 7, 2013
  6. 4/6 diff: add diff_line_prefix functionJohn Keeping, Feb 7, 2013
  7. 5/6 diff.c: use diff_line_prefix() where applicableJohn Keeping, Feb 7, 2013
  8. 6/6 combine-diff.c: teach combined diffs about line prefixJohn Keeping, Feb 7, 2013
  9. Junio C HamanoFeb 7, 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.