diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-12-01 01:49:44 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-12-01 01:49:44 +0300 |
commit | e082a85708e70a04bbdd8fbb23ad81643b7be280 (patch) | |
tree | 5e35767743e75a9ebcedfe4981d157526e2b0d8b | |
parent | b94b1f9af88f4af5edc4e6f34e9ffdeec55ea387 (diff) | |
parent | 45fef1599af19404a7d0d80a985b303d665ef4a3 (diff) |
Merge branch 'na/notes-displayref-is-not-boolean'
Config parser fix for "git notes".
* na/notes-displayref-is-not-boolean:
t3301: test proper exit response to no-value notes.displayRef.
notes.c: fix a segfault in notes_display_config()
-rw-r--r-- | notes.c | 2 | ||||
-rwxr-xr-x | t/t3301-notes.sh | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -970,7 +970,7 @@ static int notes_display_config(const char *k, const char *v, void *cb) if (*load_refs && !strcmp(k, "notes.displayref")) { if (!v) - config_error_nonbool(k); + return config_error_nonbool(k); string_list_add_refs_by_glob(&display_notes_refs, v); } diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index 8f43303007..ca60faf480 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh @@ -672,6 +672,11 @@ test_expect_success 'notes.displayRef respects order' ' test_cmp expect-both-reversed actual ' +test_expect_success 'notes.displayRef with no value handled gracefully' ' + test_must_fail git -c notes.displayRef log -0 --notes && + test_must_fail git -c notes.displayRef diff-tree --notes HEAD +' + test_expect_success 'GIT_NOTES_DISPLAY_REF works' ' GIT_NOTES_DISPLAY_REF=refs/notes/commits:refs/notes/other \ git log -2 >actual && |