From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Apr 2022 17:56:23 +0000 (-0700)
Subject: Merge branch 'rc/fetch-refetch'
X-Git-Tag: v2.36.0-rc0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f5e8851737282c9dd342032fe9a2d8b10367c9a;p=thirdparty%2Fgit.git

Merge branch 'rc/fetch-refetch'

"git fetch --refetch" learned to fetch everything without telling
the other side what we already have, which is useful when you
cannot trust what you have in the local object store.

* rc/fetch-refetch:
  docs: mention --refetch fetch option
  fetch: after refetch, encourage auto gc repacking
  t5615-partial-clone: add test for fetch --refetch
  fetch: add --refetch option
  builtin/fetch-pack: add --refetch option
  fetch-pack: add refetch
  fetch-negotiator: add specific noop initializer
---

0f5e8851737282c9dd342032fe9a2d8b10367c9a
diff --cc builtin/fetch-pack.c
index c4b9104f9b,1f8aec97d4..f045bbbe94
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@@ -153,7 -153,11 +153,11 @@@ int cmd_fetch_pack(int argc, const cha
  			args.from_promisor = 1;
  			continue;
  		}
+ 		if (!strcmp("--refetch", arg)) {
+ 			args.refetch = 1;
+ 			continue;
+ 		}
 -		if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) {
 +		if (skip_prefix(arg, ("--filter="), &arg)) {
  			parse_list_objects_filter(&args.filter_options, arg);
  			continue;
  		}