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

Re: [PATCH 1/6] shortlog: match both "Author:" and "author" on stdin

From
Jeff King <peff@peff.net>
Date
Jan 18, 2016, 19:26 UTC
Message-ID
<20160118192621.GA981@sigill.intra.peff.net>
In-Reply-To
<20160115170823.GA21102@sigill.intra.peff.net>
On Fri, Jan 15, 2016 at 12:08:23PM -0500, Jeff King wrote:
Show 11 quoted lines
> The original git-shortlog could read both the normal "git
> log" output as well as "git log --format=raw". However, when it was
> converted to C by b8ec592 (Build in shortlog, 2006-10-22),
> the trailing colon became mandatory, and we no longer
> matched the raw output.
> 
> Given the amount of intervening time without any bug
> reports, it's probable that nobody cares. But given that
> it's easy to fix, and that the end result is hopefully more
> obvious and flexible (it could now easily accomodate matching
> "Committer"), let's just make it work.

I rebased the rest of my shortlog-trailer series on this, and sadly, this final sentence isn't quite true.

The regular "git log" output uses "Commit:" for the committer line, and the raw output uses "committer". So the match_ident_header function _can't_ be reused.

So it's not wrong, but it's perhaps more complicated than it needs to be. We could scrap this patch in favor of just:

  if (!skip_prefix(author, "Author: ", &v) &&
      !skip_prefix(author, "author ", &v))
          continue;

That is technically more strict (it does not take "author: ", which is accepted by the current code), but matches "git log" and "git log --raw" output, and misses nothing that git has ever generated. And it extends naturally to:

  if (!skip_prefix(author, "Commit: ", &v) &&
      !skip_prefix(author, "committer ", &v))
          continue;
-Peff
Previous: Jeff KingNext: Junio C Hamano
Message 5 of 22 in “shortlog fixes and optimizations”
  1. 0/6 shortlog fixes and optimizationsJeff King, Jan 15, 2016
  2. 1/6 shortlog: match both "Author:" and "author" on stdinJeff King, Jan 15, 2016
  3. Eric SunshineJan 15, 2016
  4. Jeff KingJan 18, 2016
  5. Jeff KingJan 18, 2016
  6. Junio C HamanoJan 18, 2016
  7. 0/6 shortlog fixes and optimizationsJeff King, Jan 18, 2016
  8. 1/6 shortlog: match both "Author:" and "author" on stdinJeff King, Jan 18, 2016
  9. 2/6 shortlog: use strbufs to read from stdinJeff King, Jan 18, 2016
  10. 3/6 shortlog: replace hand-parsing of author with pretty-printerJeff King, Jan 18, 2016
  11. Jeff KingJan 18, 2016
  12. Jeff KingJan 18, 2016
  13. Junio C HamanoJan 19, 2016
  14. 4/6 shortlog: optimize "--summary" modeJeff King, Jan 18, 2016
  15. 5/6 shortlog: optimize out useless "<none>" normalizationJeff King, Jan 18, 2016
  16. 6/6 shortlog: optimize out useless string listJeff King, Jan 18, 2016
  17. 2/6 shortlog: use strbufs to read from stdinJeff King, Jan 15, 2016
  18. 3/6 shortlog: replace hand-parsing of author with pretty-printerJeff King, Jan 15, 2016
  19. 4/6 shortlog: optimize "--summary" modeJeff King, Jan 15, 2016
  20. 5/6 shortlog: optimize out useless "<none>" normalizationJeff King, Jan 15, 2016
  21. 6/6 shortlog: optimize out useless string listJeff King, Jan 15, 2016
  22. Junio C HamanoJan 15, 2016

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.