diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-04-30 13:50:25 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 13:50:25 +0900 |
| commit | d250f903596ee149dffcd65e3794dbd00b62f97e (patch) | |
| tree | 17c224b8d01073c69ce66728f64f2e5a61d98e17 /Documentation | |
| parent | Merge branch 'ow/push-quiet-set-upstream' (diff) | |
| parent | maintenance: respect remote.*.skipFetchAll (diff) | |
| download | tgif-d250f903596ee149dffcd65e3794dbd00b62f97e.tar.xz | |
Merge branch 'ds/maintenance-prefetch-fix'
The prefetch task in "git maintenance" assumed that "git fetch"
from any remote would fetch all its local branches, which would
fetch too much if the user is interested in only a subset of
branches there.
* ds/maintenance-prefetch-fix:
maintenance: respect remote.*.skipFetchAll
maintenance: use 'git fetch --prefetch'
fetch: add --prefetch option
maintenance: simplify prefetch logic
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/fetch-options.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-maintenance.txt | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 07783deee3..9e7b4e189c 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -110,6 +110,11 @@ ifndef::git-pull[] setting `fetch.writeCommitGraph`. endif::git-pull[] +--prefetch:: + Modify the configured refspec to place all refs into the + `refs/prefetch/` namespace. See the `prefetch` task in + linkgit:git-maintenance[1]. + -p:: --prune:: Before fetching, remove any remote-tracking references that no diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt index 80ddd33ceb..1e738ad398 100644 --- a/Documentation/git-maintenance.txt +++ b/Documentation/git-maintenance.txt @@ -92,10 +92,8 @@ commit-graph:: prefetch:: The `prefetch` task updates the object directory with the latest objects from all registered remotes. For each remote, a `git fetch` - command is run. The refmap is custom to avoid updating local or remote - branches (those in `refs/heads` or `refs/remotes`). Instead, the - remote refs are stored in `refs/prefetch/<remote>/`. Also, tags are - not updated. + command is run. The configured refspec is modified to place all + requested refs within `refs/prefetch/`. Also, tags are not updated. + This is done to avoid disrupting the remote-tracking branches. The end users expect these refs to stay unmoved unless they initiate a fetch. With prefetch |