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

[PATCH v3 0/2] builtin/shortlog: explicitly set hash algo when there is no repo

From
Wolfgang Müller <wolf@oriole.systems>
Date
Oct 16, 2024, 18:21 UTC
Message-ID
<20241016182124.48148-1-wolf@oriole.systems>
In-Reply-To
<20241011183445.229228-1-wolf@oriole.systems>

Here's v3 of this series. CI should now pass as the code has been moved below any declarations. The regression test has been simplified, thanks to Eric's input.

I added another commit with a test for git-shortlog(1) that makes sure it can process logs obtained from a repo with --object-format=sha256. Thanks to Patrick for the suggestion and pointers.

Wolfgang Müller (2):
  builtin/shortlog: explicitly set hash algo when there is no repo
  shortlog: Test reading a log from a SHA256 repo in a non-git directory
 builtin/shortlog.c  | 12 ++++++++++++
 t/t4201-shortlog.sh | 12 ++++++++++++
 2 files changed, 24 insertions(+)
Range-diff against v2:
1:  d3047a0291 ! 1:  4813b458ac builtin/shortlog: explicitly set hash algo when there is no repo
    @@ Commit message
         add a regression test for the segfault.
     
         Signed-off-by: Wolfgang Müller <wolf@oriole.systems>
    +    Thanks-to: Eric Sunshine <sunshine@sunshineco.com>
     
      ## builtin/shortlog.c ##
     @@ builtin/shortlog.c: int cmd_shortlog(int argc,
    - 	struct rev_info rev;
    - 	int nongit = !startup_info->have_repository;
    + 
    + 	struct parse_opt_ctx_t ctx;
      
     +	/*
     +	 * NEEDSWORK: Later on we'll call parse_revision_opt which relies on
    @@ builtin/shortlog.c: int cmd_shortlog(int argc,
     +	if (nongit && !the_hash_algo)
     +		repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
     +
    - 	const struct option options[] = {
    - 		OPT_BIT('c', "committer", &log.groups,
    - 			N_("group by committer rather than author"),
    + 	git_config(git_default_config, NULL);
    + 	shortlog_init(&log);
    + 	repo_init_revisions(the_repository, &rev, prefix);
     
      ## t/t4201-shortlog.sh ##
     @@ t/t4201-shortlog.sh: fuzz()
    @@ t/t4201-shortlog.sh: fuzz()
      '
      
     +test_expect_success 'shortlog --author from non-git directory does not segfault' '
    -+	git log --no-expand-tabs HEAD >log &&
    -+	env GIT_DIR=non-existing git shortlog --author=author <log 2>out
    ++	echo | nongit git shortlog --author=author
     +'
     +
      test_expect_success 'shortlog should add newline when input line matches wraplen' '
-:  ---------- > 2:  9dfdc7510f shortlog: Test reading a log from a SHA256 repo in a non-git directory
-- 
2.47.0
Previous: Wolfgang MüllerNext: Wolfgang Müller
Message 21 of 36 in “builtin/shortlog: explicitly set hash algo when there is no repo”
  1. builtin/shortlog: explicitly set hash algo when there is no repoWolfgang Müller, Oct 11, 2024
  2. Wolfgang MüllerOct 15, 2024
  3. Kristoffer HaugsbakkOct 15, 2024
  4. Taylor BlauOct 15, 2024
  5. Taylor BlauOct 15, 2024
  6. Wolfgang MüllerOct 16, 2024
  7. Taylor BlauOct 16, 2024
  8. builtin/shortlog: explicitly set hash algo when there is no repoWolfgang Müller, Oct 15, 2024
  9. Eric SunshineOct 15, 2024
  10. Wolfgang MüllerOct 15, 2024
  11. Patrick SteinhardtOct 16, 2024
  12. Wolfgang MüllerOct 16, 2024
  13. Patrick SteinhardtOct 16, 2024
  14. Wolfgang MüllerOct 16, 2024
  15. Taylor BlauOct 16, 2024
  16. Wolfgang MüllerOct 16, 2024
  17. Patrick SteinhardtOct 17, 2024
  18. Wolfgang MüllerOct 16, 2024
  19. Taylor BlauOct 16, 2024
  20. Wolfgang MüllerOct 16, 2024
  21. 0/2 builtin/shortlog: explicitly set hash algo when there is no repoWolfgang Müller, Oct 16, 2024
  22. 1/2 builtin/shortlog: explicitly set hash algo when there is no repoWolfgang Müller, Oct 16, 2024
  23. Taylor BlauOct 16, 2024
  24. Wolfgang MüllerOct 16, 2024
  25. Patrick SteinhardtOct 17, 2024
  26. Wolfgang MüllerOct 17, 2024
  27. Patrick SteinhardtOct 17, 2024
  28. 2/2 shortlog: Test reading a log from a SHA256 repo in a non-git directoryWolfgang Müller, Oct 16, 2024
  29. Taylor BlauOct 16, 2024
  30. Wolfgang MüllerOct 16, 2024
  31. Taylor BlauOct 16, 2024
  32. Taylor BlauOct 16, 2024
  33. Wolfgang MüllerOct 16, 2024
  34. builtin/shortlog: explicitly set hash algo when there is no repoWolfgang Müller, Oct 17, 2024
  35. Taylor BlauOct 17, 2024
  36. Wolfgang MüllerOct 17, 2024

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.