summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Nate Avers <nate@roosteregg.cc>2020-11-22 22:23:41 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-23 10:42:22 -0800
commitc3eb95a0d759d80d53ccb396627c400cd3db6e6d (patch)
treed5666fa66e8182f546750e524fc07eae13820685 /t/t3310-notes-merge-manual-resolve.sh
parentGit 2.24.3 (diff)
downloadtgif-c3eb95a0d759d80d53ccb396627c400cd3db6e6d.tar.xz
notes.c: fix a segfault in notes_display_config()
If notes.displayRef is configured with no value[1], control should be returned to the caller when notes.c:notes_display_config() checks if 'v' is NULL. Otherwise, both git log --notes and git diff-tree --notes will subsequently segfault when refs.h:has_glob_specials() calls strpbrk() with a NULL first argument. [1] Examples: .git/config: [notes] displayRef $ git -c notes.displayRef [...] Signed-off-by: Nate Avers <nate@roosteregg.cc> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions