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

Re: [PATCH 2/4] log and rev-list: Fixed newline termination issues with --graph

From
GSGovind Salinas <blix@sophiasuchtig.com>
Date
Apr 8, 2008, 00:25 UTC
Message-ID
<5d46db230804071725r44694e76l3d6e63aabc67f372@mail.gmail.com>
In-Reply-To
<7vmyo5nr2h.fsf@gitster.siamese.dyndns.org>
On Mon, Apr 7, 2008 at 7:11 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 41 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>
>  >  (2) Presence of %n in "--pretty=format:..." means a multi-line output and
>  >      uses separator as before; lack of %n means it is a one-line format
>  >      and uses terminator.
>
>  After thinking about this a bit more, I think a slight variant of the
>  above probably is the least intrusive both from code and semantics point
>  of view, and would match end-user expectations pretty well.
>
>  This attached patch introduces a single bit "use_terminator" in "struct
>  rev_info", which is normally false (i.e. most formats use separator
>  semantics) but by flipping it to true, you can ask for terminator
>  semantics just like oneline format does.
>
>  The function get_commit_format(), which is what parses "--pretty=" option,
>  now takes a pointer to "struct rev_info" and updates its commit_format and
>  use_terminator fields.  It used to return the value of type "enum
>  cmit_fmt", but all the callers assigned it to rev->commit_format.
>
>  There are only two cases the code turns use_terminator on.  Obviously, the
>  traditional oneline format (--pretty=oneline) is one of them, and the new
>  case is --pretty=format:... that does not end with "%n".
>
>  When the custom format "--pretty=format:" is:
>
>         "A: %an <%ae>%nC: %cn <%ce>%n"
>
>  it represents a record with two lines (author and committer), and these
>  are output with an extra LF in between, just like the regular --pretty
>  without customization will get an extra separator.  The custom format
>
>         "A: %an <%ae> C: %cn <%ce>"
>
>  will give a one-line-per-commit output, each of which is terminated with
>  LF.  And
>
>         "A: %an <%ae>%nC: %cn <%ce>"
>
>  will give two line per commit without extra separator.
>
Hi,

Shouldn't whatever option is used here respect line_terminator such that it will use NULL bytes when -z is used? Having watched this discussion, it seems like you really want an option --whatever that forces a record terminator between records and, I assume, at the end. I have not seen anyone suggest it, perhaps I missed it.

-Govind
Previous: Junio C HamanoNext: Junio C Hamano
Message 17 of 37 in “Add history graph API”
  1. 1/4 Add history graph APIAdam Simpkins, Apr 6, 2008
  2. 2/4 graph API: Added additional utility functions to the graph APIAdam Simpkins, Apr 6, 2008
  3. 3/4 git log and git rev-list: Add --graph optionAdam Simpkins, Apr 6, 2008
  4. 4/4 git log: Updated --graph to work even when the commit list is prunedAdam Simpkins, Apr 6, 2008
  5. 5/5 Document the new --graph option for log and rev-listAdam Simpkins, Apr 6, 2008
  6. 1/4 graph API: Fixed coding style problemsAdam Simpkins, Apr 7, 2008
  7. 2/4 log and rev-list: Fixed newline termination issues with --graphAdam Simpkins, Apr 7, 2008
  8. 3/4 log and rev-list: Fix --graph output with --pretty=emailAdam Simpkins, Apr 7, 2008
  9. 4/4 log and rev-list: Improve --graph output when commits have been prunedAdam Simpkins, Apr 7, 2008
  10. Junio C HamanoApr 7, 2008
  11. Junio C HamanoApr 7, 2008
  12. Jeff KingApr 7, 2008
  13. Junio C HamanoApr 7, 2008
  14. Adam SimpkinsApr 7, 2008
  15. Jakub NarebskiApr 7, 2008
  16. Junio C HamanoApr 8, 2008
  17. Govind SalinasApr 8, 2008
  18. Junio C HamanoApr 8, 2008
  19. Teemu LikonenApr 6, 2008
  20. Adam SimpkinsApr 6, 2008
  21. Teemu LikonenApr 6, 2008
  22. Adam SimpkinsApr 6, 2008
  23. Johannes SchindelinApr 6, 2008
  24. Adam SimpkinsApr 6, 2008
  25. Teemu LikonenApr 7, 2008
  26. Adam SimpkinsApr 7, 2008
  27. Teemu LikonenApr 7, 2008
  28. Johannes SchindelinApr 6, 2008
  29. Adam SimpkinsApr 6, 2008
  30. Johannes SchindelinApr 6, 2008
  31. Adam SimpkinsApr 6, 2008
  32. Linus TorvaldsApr 7, 2008
  33. Junio C HamanoApr 7, 2008
  34. bash: Add command line completion of --graph (git log)Teemu Likonen, Apr 6, 2008
  35. bash: Add more command line option completions for 'git log'Teemu Likonen, Apr 7, 2008
  36. Teemu LikonenApr 7, 2008
  37. Adam SimpkinsApr 7, 2008

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.