[PATCH 2/2] index-pack: remove fetch_if_missing=0
- From
- Hariom Verma via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Apr 20, 2020, 19:54 UTC
- Message-ID
- <82f7473d3b8225771bbf09023ad2b5b787261dd0.1587412477.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.606.git.1587412477.gitgitgadget@gmail.com>
From: Hariom Verma <hariom18599@gmail.com>
Commit 6462d5e ("fetch: remove fetch_if_missing=0", 2019-11-08) strove to remove the need for fetch_if_missing=0 from the fetching mechanism, so it is plausible to attempt removing fetch_if_missing=0 from index-pack as well.
Signed-off-by: Hariom Verma <hariom18599@gmail.com> --- builtin/index-pack.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index d967d188a30..9847baaf3f4 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -782,7 +782,8 @@ static void sha1_object(const void *data, struct object_entry *obj_entry, if (startup_info->have_repository) { read_lock(); collision_test_needed = - has_object_file_with_flags(oid, OBJECT_INFO_QUICK); + has_object_file_with_flags(oid, OBJECT_INFO_QUICK | + OBJECT_INFO_SKIP_FETCH_OBJECT); read_unlock(); } @@ -1673,14 +1674,6 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) unsigned foreign_nr = 1; /* zero is a "good" value, assume bad */ int report_end_of_input = 0; - /* - * index-pack never needs to fetch missing objects except when - * REF_DELTA bases are missing (which are explicitly handled). It only - * accesses the repo to do hash collision checks and to check which - * REF_DELTA bases need to be fetched. - */ - fetch_if_missing = 0; - if (argc == 2 && !strcmp(argv[1], "-h")) usage(index_pack_usage);
-- gitgitgadget