summaryrefslogtreecommitdiff
path: root/t/t3301-notes.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-30 14:49:44 -0800
committerJunio C Hamano <gitster@pobox.com>2020-11-30 14:49:44 -0800
commite082a85708e70a04bbdd8fbb23ad81643b7be280 (patch)
tree5e35767743e75a9ebcedfe4981d157526e2b0d8b /t/t3301-notes.sh
parentb94b1f9af88f4af5edc4e6f34e9ffdeec55ea387 (diff)
parent45fef1599af19404a7d0d80a985b303d665ef4a3 (diff)
downloadgit-e082a85708e70a04bbdd8fbb23ad81643b7be280.tar.gz
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()
Diffstat (limited to 't/t3301-notes.sh')
-rwxr-xr-xt/t3301-notes.sh5
1 files changed, 5 insertions, 0 deletions
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 &&