Skip to content

Commit b330016

Browse files
wylfenttaylorr
authored andcommitted
builtin/shortlog: explicitly set hash algo when there is no repo
Whilst git-shortlog(1) does not explicitly need any repository information when run without reference to one, it still parses some of its arguments with parse_revision_opt() which assumes that the hash algorithm is set. However, in c8aed5e (repository: stop setting SHA1 as the default object hash, 2024-05-07) we stopped setting up a default hash algorithm and instead require commands to set it up explicitly. This was done for most other commands like in ab27490 (builtin/diff: explicitly set hash algo when there is no repo, 2024-05-07) but was missed for builtin/shortlog, making git-shortlog(1) segfault outside of a repository when given arguments like --author that trigger a call to parse_revision_opt(). Fix this for now by explicitly setting the hash algorithm to SHA1. Also add a regression test for the segfault. Thanks-to: Eric Sunshine <[email protected]> Signed-off-by: Wolfgang Müller <[email protected]> Signed-off-by: Taylor Blau <[email protected]>
1 parent ef8ce8f commit b330016

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

builtin/shortlog.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,18 @@ int cmd_shortlog(int argc,
407407

408408
struct parse_opt_ctx_t ctx;
409409

410+
/*
411+
* NEEDSWORK: Later on we'll call parse_revision_opt which relies on
412+
* the hash algorithm being set but since we are operating outside of a
413+
* Git repository we cannot determine one. This is only needed because
414+
* parse_revision_opt expects hexsz for --abbrev which is irrelevant
415+
* for shortlog outside of a git repository. For now explicitly set
416+
* SHA1, but ideally the parsing machinery would be split between
417+
* git/nongit so that we do not have to do this.
418+
*/
419+
if (nongit && !the_hash_algo)
420+
repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
421+
410422
git_config(git_default_config, NULL);
411423
shortlog_init(&log);
412424
repo_init_revisions(the_repository, &rev, prefix);

t/t4201-shortlog.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ test_expect_success 'shortlog from non-git directory refuses extra arguments' '
143143
test_grep "too many arguments" out
144144
'
145145

146+
test_expect_success 'shortlog --author from non-git directory does not segfault' '
147+
nongit git shortlog --author=author </dev/null
148+
'
149+
146150
test_expect_success 'shortlog should add newline when input line matches wraplen' '
147151
cat >expect <<\EOF &&
148152
A U Thor (2):

0 commit comments

Comments
 (0)