0838bf47b3
The old behavior of "fetch --prune" was to prune whatever was being
fetched. In particular, "fetch --prune --tags" caused tags not only
to be fetched, but also to be pruned. This is inappropriate because
there is only one tags namespace that is shared among the local
repository and all remotes. Therefore, if the user defines a local
tag and then runs "git fetch --prune --tags", then the local tag is
deleted. Moreover, "--prune" and "--tags" can also be configured via
fetch.prune / remote.<name>.prune and remote.<name>.tagopt, making it
even less obvious that an invocation of "git fetch" could result in
tag lossage.
Since the command "git remote update" invokes "git fetch", it had the
same problem.
The command "git remote prune", on the other hand, disregarded the
setting of remote.<name>.tagopt, and so its behavior was inconsistent
with that of the other commands.
So the old behavior made it too easy to lose tags. To fix this
problem, change "fetch --prune" to prune references based only on
refspecs specified explicitly by the user, either on the command line
or via remote.<name>.fetch. Thus, tags are no longer made subject to
pruning by the --tags option or the remote.<name>.tagopt setting.
However, tags *are* still subject to pruning if they are fetched as
part of a refspec, and that is good. For example:
* On the command line,
git fetch --prune 'refs/tags/*:refs/tags/*'
causes tags, and only tags, to be fetched and pruned, and is
therefore a simple way for the user to get the equivalent of the old
behavior of "--prune --tag".
* For a remote that was configured with the "--mirror" option, the
configuration is set to include
[remote "name"]
fetch = +refs/*:refs/*
, which causes tags to be subject to pruning along with all other
references. This is the behavior that will typically be desired for
a mirror.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
138 lines
4.6 KiB
Plaintext
138 lines
4.6 KiB
Plaintext
--all::
|
|
Fetch all remotes.
|
|
|
|
-a::
|
|
--append::
|
|
Append ref names and object names of fetched refs to the
|
|
existing contents of `.git/FETCH_HEAD`. Without this
|
|
option old data in `.git/FETCH_HEAD` will be overwritten.
|
|
|
|
--depth=<depth>::
|
|
Deepen or shorten the history of a 'shallow' repository created by
|
|
`git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
|
|
to the specified number of commits from the tip of each remote
|
|
branch history. Tags for the deepened commits are not fetched.
|
|
|
|
--unshallow::
|
|
Convert a shallow repository to a complete one, removing all
|
|
the limitations imposed by shallow repositories.
|
|
|
|
ifndef::git-pull[]
|
|
--dry-run::
|
|
Show what would be done, without making any changes.
|
|
endif::git-pull[]
|
|
|
|
-f::
|
|
--force::
|
|
When 'git fetch' is used with `<rbranch>:<lbranch>`
|
|
refspec, it refuses to update the local branch
|
|
`<lbranch>` unless the remote branch `<rbranch>` it
|
|
fetches is a descendant of `<lbranch>`. This option
|
|
overrides that check.
|
|
|
|
-k::
|
|
--keep::
|
|
Keep downloaded pack.
|
|
|
|
ifndef::git-pull[]
|
|
--multiple::
|
|
Allow several <repository> and <group> arguments to be
|
|
specified. No <refspec>s may be specified.
|
|
|
|
-p::
|
|
--prune::
|
|
After fetching, remove any remote-tracking references that no
|
|
longer exist on the remote. Tags are not subject to pruning
|
|
if they are fetched only because of the default tag
|
|
auto-following or due to a --tags option. However, if tags
|
|
are fetched due to an explicit refspec (either on the command
|
|
line or in the remote configuration, for example if the remote
|
|
was cloned with the --mirror option), then they are also
|
|
subject to pruning.
|
|
endif::git-pull[]
|
|
|
|
ifdef::git-pull[]
|
|
--no-tags::
|
|
endif::git-pull[]
|
|
ifndef::git-pull[]
|
|
-n::
|
|
--no-tags::
|
|
endif::git-pull[]
|
|
By default, tags that point at objects that are downloaded
|
|
from the remote repository are fetched and stored locally.
|
|
This option disables this automatic tag following. The default
|
|
behavior for a remote may be specified with the remote.<name>.tagopt
|
|
setting. See linkgit:git-config[1].
|
|
|
|
ifndef::git-pull[]
|
|
-t::
|
|
--tags::
|
|
Fetch all tags from the remote (i.e., fetch remote tags
|
|
`refs/tags/*` into local tags with the same name), in addition
|
|
to whatever else would otherwise be fetched. Using this
|
|
option alone does not subject tags to pruning, even if --prune
|
|
is used (though tags may be pruned anyway if they are also the
|
|
destination of an explicit refspec; see '--prune').
|
|
|
|
--recurse-submodules[=yes|on-demand|no]::
|
|
This option controls if and under what conditions new commits of
|
|
populated submodules should be fetched too. It can be used as a
|
|
boolean option to completely disable recursion when set to 'no' or to
|
|
unconditionally recurse into all populated submodules when set to
|
|
'yes', which is the default when this option is used without any
|
|
value. Use 'on-demand' to only recurse into a populated submodule
|
|
when the superproject retrieves a commit that updates the submodule's
|
|
reference to a commit that isn't already in the local submodule
|
|
clone.
|
|
|
|
--no-recurse-submodules::
|
|
Disable recursive fetching of submodules (this has the same effect as
|
|
using the '--recurse-submodules=no' option).
|
|
|
|
--submodule-prefix=<path>::
|
|
Prepend <path> to paths printed in informative messages
|
|
such as "Fetching submodule foo". This option is used
|
|
internally when recursing over submodules.
|
|
|
|
--recurse-submodules-default=[yes|on-demand]::
|
|
This option is used internally to temporarily provide a
|
|
non-negative default value for the --recurse-submodules
|
|
option. All other methods of configuring fetch's submodule
|
|
recursion (such as settings in linkgit:gitmodules[5] and
|
|
linkgit:git-config[1]) override this option, as does
|
|
specifying --[no-]recurse-submodules directly.
|
|
endif::git-pull[]
|
|
|
|
-u::
|
|
--update-head-ok::
|
|
By default 'git fetch' refuses to update the head which
|
|
corresponds to the current branch. This flag disables the
|
|
check. This is purely for the internal use for 'git pull'
|
|
to communicate with 'git fetch', and unless you are
|
|
implementing your own Porcelain you are not supposed to
|
|
use it.
|
|
|
|
--upload-pack <upload-pack>::
|
|
When given, and the repository to fetch from is handled
|
|
by 'git fetch-pack', '--exec=<upload-pack>' is passed to
|
|
the command to specify non-default path for the command
|
|
run on the other end.
|
|
|
|
ifndef::git-pull[]
|
|
-q::
|
|
--quiet::
|
|
Pass --quiet to git-fetch-pack and silence any other internally
|
|
used git commands. Progress is not reported to the standard error
|
|
stream.
|
|
|
|
-v::
|
|
--verbose::
|
|
Be verbose.
|
|
endif::git-pull[]
|
|
|
|
--progress::
|
|
Progress status is reported on the standard error stream
|
|
by default when it is attached to a terminal, unless -q
|
|
is specified. This flag forces progress status even if the
|
|
standard error stream is not directed to a terminal.
|