undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

for-each-ref: do not segv with %(HEAD) on an unborn branch

Browse Source 
The code to flip between "*" and " " prefixes depending on what
branch is checked out used in --format='%(HEAD)' did not consider
that HEAD may resolve to an unborn branch and dereferenced a NULL.

This will become a lot easier to trigger as the codepath will be
used to reimplement "git branch [--list]" in the future.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2016-11-18 15:21:12 -08:00
parent 0b65a8dbdb
commit 84679d470d
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ref-filter.c
View File

@ -1017,7 +1017,7 @@ static void populate_value(struct ref_array_item *ref)
head = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
sha1, NULL); sha1, NULL);
if (!strcmp(ref->refname, head)) if (head && !strcmp(ref->refname, head))
v->s = "*"; v->s = "*";
else else
v->s = " "; v->s = " ";

10
t/t6300-for-each-ref.sh
View File

@ -553,4 +553,14 @@ test_expect_success 'Verify sort with multiple keys' '
refs/tags/bogo refs/tags/master > actual && refs/tags/bogo refs/tags/master > actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' '
test_when_finished "git checkout master" &&
git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
sed -e "s/^\* / /" actual >expect &&
git checkout --orphan HEAD &&
git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
test_cmp expect actual
'
test_done test_done