]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/optional-path'
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2025 05:49:56 +0000 (14:49 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2025 05:49:56 +0000 (14:49 +0900)
"git config get --path" segfaulted on an ":(optional)path" that
does not exist, which has been corrected.

* jc/optional-path:
  config: really treat missing optional path as not configured
  config: really pretend missing :(optional) value is not there
  config: mark otherwise unused function as file-scope static

1  2 
builtin/blame.c
builtin/config.c
builtin/receive-pack.c
config.c
fetch-pack.c
fsck.c
gpg-interface.c
setup.c
t/meson.build

diff --cc builtin/blame.c
Simple merge
Simple merge
Simple merge
diff --cc config.c
Simple merge
diff --cc fetch-pack.c
Simple merge
diff --cc fsck.c
Simple merge
diff --cc gpg-interface.c
Simple merge
diff --cc setup.c
Simple merge
diff --cc t/meson.build
Simple merge