]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ob/core-attributesfile-in-repository' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Feb 2026 23:16:30 +0000 (15:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Feb 2026 23:16:30 +0000 (15:16 -0800)
commit2b2e3a1fa985286c2a9c808d9bee7271b607f6ec
tree9cd13ed261c7943bd9a6d1182665cdeea1963a24
parent6a04cca28e210f0c51cfefcb52475c7ede6e99fb
parentcf50830ce1d1b95a44f9d095ff868e7df1495863
Merge branch 'ob/core-attributesfile-in-repository' into next

The core.attributesfile is intended to be set per repository, but
were kept track of by a single global variable in-core, which has
been corrected by moving it to per-repository data structure.

* ob/core-attributesfile-in-repository:
  environment: move "branch.autoSetupMerge" into `struct repo_config_values`
  environment: stop using core.sparseCheckout globally
  environment: stop storing `core.attributesFile` globally
12 files changed:
builtin/backfill.c
builtin/checkout.c
builtin/clone.c
builtin/grep.c
builtin/sparse-checkout.c
builtin/submodule--helper.c
builtin/worktree.c
environment.c
environment.h
repository.c
repository.h
wt-status.c