]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/disable-replace-refs'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jun 2023 23:29:05 +0000 (16:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jun 2023 23:29:06 +0000 (16:29 -0700)
Introduce a mechanism to disable replace refs globally and per
repository.

* ds/disable-replace-refs:
  repository: create read_replace_refs setting
  replace-objects: create wrapper around setting
  repository: create disable_replace_refs()

1  2 
builtin/fsck.c
builtin/pack-objects.c
commit-graph.c
config.c
environment.c
git.c
log-tree.c
repository.h

diff --cc builtin/fsck.c
Simple merge
Simple merge
diff --cc commit-graph.c
Simple merge
diff --cc config.c
Simple merge
diff --cc environment.c
Simple merge
diff --cc git.c
Simple merge
diff --cc log-tree.c
Simple merge
diff --cc repository.h
Simple merge