]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rc/fetch-refetch'
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Apr 2022 17:56:23 +0000 (10:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Apr 2022 17:56:23 +0000 (10:56 -0700)
"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

1  2 
Documentation/fetch-options.txt
builtin/fetch-pack.c
builtin/fetch.c
remote-curl.c
transport.c

Simple merge
index c4b9104f9b58edfcc8064d29d5b77641020c671a,1f8aec97d47e3dfb5957ebe29294d881fb22585e..f045bbbe946dcbf96eff8849317c499595de295f
@@@ -153,7 -153,11 +153,11 @@@ int cmd_fetch_pack(int argc, const cha
                        args.from_promisor = 1;
                        continue;
                }
 -              if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) {
+               if (!strcmp("--refetch", arg)) {
+                       args.refetch = 1;
+                       continue;
+               }
 +              if (skip_prefix(arg, ("--filter="), &arg)) {
                        parse_list_objects_filter(&args.filter_options, arg);
                        continue;
                }
diff --cc builtin/fetch.c
Simple merge
diff --cc remote-curl.c
Simple merge
diff --cc transport.c
Simple merge