]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/config-multi-and-nonbool'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Apr 2023 20:38:28 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Apr 2023 20:38:29 +0000 (13:38 -0700)
Assorted config API updates.

* ab/config-multi-and-nonbool:
  for-each-repo: with bad config, don't conflate <path> and <cmd>
  config API: add "string" version of *_value_multi(), fix segfaults
  config API users: test for *_get_value_multi() segfaults
  for-each-repo: error on bad --config
  config API: have *_multi() return an "int" and take a "dest"
  versioncmp.c: refactor config reading next commit
  config API: add and use a "git_config_get()" family of functions
  config tests: add "NULL" tests for *_get_value_multi()
  config tests: cover blind spots in git_die_config() tests

12 files changed:
1  2 
builtin/gc.c
builtin/log.c
builtin/submodule--helper.c
builtin/worktree.c
config.c
config.h
pack-bitmap.c
submodule.c
t/t0068-for-each-repo.sh
t/t5304-prune.sh
t/t5310-pack-bitmaps.sh
t/t7004-tag.sh

diff --cc builtin/gc.c
Simple merge
diff --cc builtin/log.c
Simple merge
Simple merge
Simple merge
diff --cc config.c
Simple merge
diff --cc config.h
Simple merge
diff --cc pack-bitmap.c
Simple merge
diff --cc submodule.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/t7004-tag.sh
Simple merge