@matheusbsbs / matheus-bagliano / commits / cfd781ea22

maintenance: use 'git fetch --prefetch'

The 'prefetch' maintenance task previously forced the following refspec for each remote: +refs/heads/*:refs/prefetch/<remote>/* If a user has specified a more strict refspec for the remote, then this prefetch task downloads more objects than necessary. The previous change introduced the '--prefetch' option to 'git fetch' which manipulates the remote's refspec to place all resulting refs into refs/prefetch/, with further partitioning based on the destinations of those refspecs. Update the documentation to be more generic about the destination refs. Do not mention custom refspecs explicitly, as that does not need to be highlighted in this documentation. The important part of placing refs in refs/prefetch/ remains. Reported-by: Tom Saeger <tom.saeger@oracle.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Derrick Stolee committed Apr 16, 2021 at 12:49 UTC cfd781ea22e0f334d3c0104e1f34c47327934314
3 files changed +12 -15
Documentation/git-maintenance.txt
+2 -4
@@ -92,10 +92,8 @@ commit-graph::
92 prefetch::
93 The `prefetch` task updates the object directory with the latest
94 objects from all registered remotes. For each remote, a `git fetch`
95 - command is run. The refmap is custom to avoid updating local or remote
96 - branches (those in `refs/heads` or `refs/remotes`). Instead, the
97 - remote refs are stored in `refs/prefetch/<remote>/`. Also, tags are
98 - not updated.
95 + command is run. The configured refspec is modified to place all
96 + requested refs within `refs/prefetch/`. Also, tags are not updated.
97 +
98 This is done to avoid disrupting the remote-tracking branches. The end users
99 expect these refs to stay unmoved unless they initiate a fetch. With prefetch
builtin/gc.c
+3 -4
@@ -879,15 +879,14 @@ static int fetch_remote(struct remote *remote, void *cbdata)
879 struct child_process child = CHILD_PROCESS_INIT;
880
881 child.git_cmd = 1;
882 - strvec_pushl(&child.args, "fetch", remote->name, "--prune", "--no-tags",
882 + strvec_pushl(&child.args, "fetch", remote->name,
883 + "--prefetch", "--prune", "--no-tags",
884 "--no-write-fetch-head", "--recurse-submodules=no",
884 - "--refmap=", NULL);
885 + NULL);
886
887 if (opts->quiet)
888 strvec_push(&child.args, "--quiet");
889
889 - strvec_pushf(&child.args, "+refs/heads/*:refs/prefetch/%s/*", remote->name);
890 -
890 return !!run_command(&child);
891 }
892
t/t7900-maintenance.sh
+7 -7
@@ -141,15 +141,15 @@ test_expect_success 'prefetch multiple remotes' '
141 test_commit -C clone1 one &&
142 test_commit -C clone2 two &&
143 GIT_TRACE2_EVENT="$(pwd)/run-prefetch.txt" git maintenance run --task=prefetch 2>/dev/null &&
144 - fetchargs="--prune --no-tags --no-write-fetch-head --recurse-submodules=no --refmap= --quiet" &&
145 - test_subcommand git fetch remote1 $fetchargs +refs/heads/\\*:refs/prefetch/remote1/\\* <run-prefetch.txt &&
146 - test_subcommand git fetch remote2 $fetchargs +refs/heads/\\*:refs/prefetch/remote2/\\* <run-prefetch.txt &&
144 + fetchargs="--prefetch --prune --no-tags --no-write-fetch-head --recurse-submodules=no --quiet" &&
145 + test_subcommand git fetch remote1 $fetchargs <run-prefetch.txt &&
146 + test_subcommand git fetch remote2 $fetchargs <run-prefetch.txt &&
147 test_path_is_missing .git/refs/remotes &&
148 - git log prefetch/remote1/one &&
149 - git log prefetch/remote2/two &&
148 + git log prefetch/remotes/remote1/one &&
149 + git log prefetch/remotes/remote2/two &&
150 git fetch --all &&
151 - test_cmp_rev refs/remotes/remote1/one refs/prefetch/remote1/one &&
152 - test_cmp_rev refs/remotes/remote2/two refs/prefetch/remote2/two &&
151 + test_cmp_rev refs/remotes/remote1/one refs/prefetch/remotes/remote1/one &&
152 + test_cmp_rev refs/remotes/remote2/two refs/prefetch/remotes/remote2/two &&
153
154 test_cmp_config refs/prefetch/ log.excludedecoration &&
155 git log --oneline --decorate --all >log &&