diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-30 14:49:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-30 14:49:42 -0700 |
| commit | 55e5548a0f62b2b9a4e22d585320d23c06eeee65 (patch) | |
| tree | ddedabccfc6a5f9b90b1ed424cf9cb339f3b5dd6 /builtin | |
| parent | c9f43012a10c4c4b26b8966fcf8497d8db0a0c06 (diff) | |
| parent | 93e2ae1c95e2685f51fb6320508bbde20fa7949f (diff) | |
| download | git-55e5548a0f62b2b9a4e22d585320d23c06eeee65.tar.gz | |
Merge branch 'xx/disable-replace-when-building-midx'
The procedure to build multi-pack-index got confused by the
replace-refs mechanism, which has been corrected by disabling the
latter.
* xx/disable-replace-when-building-midx:
midx: disable replace objects
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/multi-pack-index.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c index a72aebecaa..8360932d2e 100644 --- a/builtin/multi-pack-index.c +++ b/builtin/multi-pack-index.c @@ -8,6 +8,7 @@ #include "strbuf.h" #include "trace2.h" #include "object-store-ll.h" +#include "replace-object.h" #define BUILTIN_MIDX_WRITE_USAGE \ N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]" \ @@ -273,6 +274,8 @@ int cmd_multi_pack_index(int argc, const char **argv, }; struct option *options = parse_options_concat(builtin_multi_pack_index_options, common_opts); + disable_replace_refs(); + git_config(git_default_config, NULL); if (the_repository && |