2005-07-16 07:17:42 +00:00
|
|
|
<repository>::
|
2005-11-05 02:36:08 +00:00
|
|
|
The "remote" repository that is the source of a fetch
|
2008-05-29 17:32:31 +00:00
|
|
|
or pull operation. This parameter can be either a URL
|
|
|
|
(see the section <<URLS,GIT URLS>> below) or the name
|
|
|
|
of a remote (see the section <<REMOTES,REMOTES>> below).
|
2005-08-24 23:23:08 +00:00
|
|
|
|
2009-11-09 20:09:56 +00:00
|
|
|
ifndef::git-pull[]
|
|
|
|
<group>::
|
|
|
|
A name referring to a list of repositories as the value
|
|
|
|
of remotes.<group> in the configuration file.
|
|
|
|
(See linkgit:git-config[1]).
|
|
|
|
endif::git-pull[]
|
|
|
|
|
2005-08-24 23:23:08 +00:00
|
|
|
<refspec>::
|
2014-06-11 14:24:04 +00:00
|
|
|
Specifies which refs to fetch and which local refs to update.
|
|
|
|
When no <refspec>s appear on the command line, the refs to fetch
|
|
|
|
are read from `remote.<repository>.fetch` variables instead
|
|
|
|
ifndef::git-pull[]
|
|
|
|
(see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below).
|
|
|
|
endif::git-pull[]
|
|
|
|
ifdef::git-pull[]
|
|
|
|
(see linkgit:git-fetch[1]).
|
|
|
|
endif::git-pull[]
|
|
|
|
+
|
|
|
|
The format of a <refspec> parameter is an optional plus
|
2017-10-17 02:31:06 +00:00
|
|
|
`+`, followed by the source <src>, followed
|
2014-06-11 14:24:04 +00:00
|
|
|
by a colon `:`, followed by the destination ref <dst>.
|
2017-10-17 02:31:06 +00:00
|
|
|
The colon can be omitted when <dst> is empty. <src> is
|
|
|
|
typically a ref, but it can also be a fully spelled hex object
|
|
|
|
name.
|
2005-10-03 17:16:30 +00:00
|
|
|
+
|
2014-05-29 20:22:01 +00:00
|
|
|
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
|
|
|
|
it requests fetching everything up to the given tag.
|
|
|
|
+
|
2006-02-05 22:43:47 +00:00
|
|
|
The remote ref that matches <src>
|
2018-08-31 20:10:03 +00:00
|
|
|
is fetched, and if <dst> is not an empty string, an attempt
|
|
|
|
is made to update the local ref that matches it.
|
|
|
|
+
|
|
|
|
Whether that update is allowed without `--force` depends on the ref
|
|
|
|
namespace it's being fetched to, the type of object being fetched, and
|
|
|
|
whether the update is considered to be a fast-forward. Generally, the
|
|
|
|
same rules apply for fetching as when pushing, see the `<refspec>...`
|
|
|
|
section of linkgit:git-push[1] for what those are. Exceptions to those
|
|
|
|
rules particular to 'git fetch' are noted below.
|
|
|
|
+
|
fetch: stop clobbering existing tags without --force
Change "fetch" to treat "+" in refspecs (aka --force) to mean we
should clobber a local tag of the same name.
This changes the long-standing behavior of "fetch" added in
853a3697dc ("[PATCH] Multi-head fetch.", 2005-08-20). Before this
change, all tag fetches effectively had --force enabled. See the
git-fetch-script code in fast_forward_local() with the comment:
> Tags need not be pointing at commits so there is no way to
> guarantee "fast-forward" anyway.
That commit and the rest of the history of "fetch" shows that the
"+" (--force) part of refpecs was only conceived for branch updates,
while tags have accepted any changes from upstream unconditionally and
clobbered the local tag object. Changing this behavior has been
discussed as early as 2011[1].
The current behavior doesn't make sense to me, it easily results in
local tags accidentally being clobbered. We could namespace our tags
per-remote and not locally populate refs/tags/*, but as with my
97716d217c ("fetch: add a --prune-tags option and fetch.pruneTags
config", 2018-02-09) it's easier to work around the current
implementation than to fix the root cause.
So this change implements suggestion #1 from Jeff's 2011 E-Mail[1],
"fetch" now only clobbers the tag if either "+" is provided as part of
the refspec, or if "--force" is provided on the command-line.
This also makes it nicely symmetrical with how "tag" itself works when
creating tags. I.e. we refuse to clobber any existing tags unless
"--force" is supplied. Now we can refuse all such clobbering, whether
it would happen by clobbering a local tag with "tag", or by fetching
it from the remote with "fetch".
Ref updates outside refs/{tags,heads/* are still still not symmetrical
with how "git push" works, as discussed in the recently changed
pull-fetch-param.txt documentation. This change brings the two
divergent behaviors more into line with one another. I don't think
there's any reason "fetch" couldn't fully converge with the behavior
used by "push", but that's a topic for another change.
One of the tests added in 31b808a032 ("clone --single: limit the fetch
refspec to fetched branch", 2012-09-20) is being changed to use
--force where a clone would clobber a tag. This changes nothing about
the existing behavior of the test.
1. https://public-inbox.org/git/20111123221658.GA22313@sigill.intra.peff.net/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-31 20:10:04 +00:00
|
|
|
Until Git version 2.20, and unlike when pushing with
|
|
|
|
linkgit:git-push[1], any updates to `refs/tags/*` would be accepted
|
2018-09-18 05:47:39 +00:00
|
|
|
without `+` in the refspec (or `--force`). When fetching, we promiscuously
|
fetch: stop clobbering existing tags without --force
Change "fetch" to treat "+" in refspecs (aka --force) to mean we
should clobber a local tag of the same name.
This changes the long-standing behavior of "fetch" added in
853a3697dc ("[PATCH] Multi-head fetch.", 2005-08-20). Before this
change, all tag fetches effectively had --force enabled. See the
git-fetch-script code in fast_forward_local() with the comment:
> Tags need not be pointing at commits so there is no way to
> guarantee "fast-forward" anyway.
That commit and the rest of the history of "fetch" shows that the
"+" (--force) part of refpecs was only conceived for branch updates,
while tags have accepted any changes from upstream unconditionally and
clobbered the local tag object. Changing this behavior has been
discussed as early as 2011[1].
The current behavior doesn't make sense to me, it easily results in
local tags accidentally being clobbered. We could namespace our tags
per-remote and not locally populate refs/tags/*, but as with my
97716d217c ("fetch: add a --prune-tags option and fetch.pruneTags
config", 2018-02-09) it's easier to work around the current
implementation than to fix the root cause.
So this change implements suggestion #1 from Jeff's 2011 E-Mail[1],
"fetch" now only clobbers the tag if either "+" is provided as part of
the refspec, or if "--force" is provided on the command-line.
This also makes it nicely symmetrical with how "tag" itself works when
creating tags. I.e. we refuse to clobber any existing tags unless
"--force" is supplied. Now we can refuse all such clobbering, whether
it would happen by clobbering a local tag with "tag", or by fetching
it from the remote with "fetch".
Ref updates outside refs/{tags,heads/* are still still not symmetrical
with how "git push" works, as discussed in the recently changed
pull-fetch-param.txt documentation. This change brings the two
divergent behaviors more into line with one another. I don't think
there's any reason "fetch" couldn't fully converge with the behavior
used by "push", but that's a topic for another change.
One of the tests added in 31b808a032 ("clone --single: limit the fetch
refspec to fetched branch", 2012-09-20) is being changed to use
--force where a clone would clobber a tag. This changes nothing about
the existing behavior of the test.
1. https://public-inbox.org/git/20111123221658.GA22313@sigill.intra.peff.net/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-31 20:10:04 +00:00
|
|
|
considered all tag updates from a remote to be forced fetches. Since
|
2018-09-18 05:47:39 +00:00
|
|
|
Git version 2.20, fetching to update `refs/tags/*` works the same way
|
fetch: stop clobbering existing tags without --force
Change "fetch" to treat "+" in refspecs (aka --force) to mean we
should clobber a local tag of the same name.
This changes the long-standing behavior of "fetch" added in
853a3697dc ("[PATCH] Multi-head fetch.", 2005-08-20). Before this
change, all tag fetches effectively had --force enabled. See the
git-fetch-script code in fast_forward_local() with the comment:
> Tags need not be pointing at commits so there is no way to
> guarantee "fast-forward" anyway.
That commit and the rest of the history of "fetch" shows that the
"+" (--force) part of refpecs was only conceived for branch updates,
while tags have accepted any changes from upstream unconditionally and
clobbered the local tag object. Changing this behavior has been
discussed as early as 2011[1].
The current behavior doesn't make sense to me, it easily results in
local tags accidentally being clobbered. We could namespace our tags
per-remote and not locally populate refs/tags/*, but as with my
97716d217c ("fetch: add a --prune-tags option and fetch.pruneTags
config", 2018-02-09) it's easier to work around the current
implementation than to fix the root cause.
So this change implements suggestion #1 from Jeff's 2011 E-Mail[1],
"fetch" now only clobbers the tag if either "+" is provided as part of
the refspec, or if "--force" is provided on the command-line.
This also makes it nicely symmetrical with how "tag" itself works when
creating tags. I.e. we refuse to clobber any existing tags unless
"--force" is supplied. Now we can refuse all such clobbering, whether
it would happen by clobbering a local tag with "tag", or by fetching
it from the remote with "fetch".
Ref updates outside refs/{tags,heads/* are still still not symmetrical
with how "git push" works, as discussed in the recently changed
pull-fetch-param.txt documentation. This change brings the two
divergent behaviors more into line with one another. I don't think
there's any reason "fetch" couldn't fully converge with the behavior
used by "push", but that's a topic for another change.
One of the tests added in 31b808a032 ("clone --single: limit the fetch
refspec to fetched branch", 2012-09-20) is being changed to use
--force where a clone would clobber a tag. This changes nothing about
the existing behavior of the test.
1. https://public-inbox.org/git/20111123221658.GA22313@sigill.intra.peff.net/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-31 20:10:04 +00:00
|
|
|
as when pushing. I.e. any updates will be rejected without `+` in the
|
|
|
|
refspec (or `--force`).
|
2018-08-31 20:10:03 +00:00
|
|
|
+
|
|
|
|
Unlike when pushing with linkgit:git-push[1], any updates outside of
|
|
|
|
`refs/{tags,heads}/*` will be accepted without `+` in the refspec (or
|
|
|
|
`--force`), whether that's swapping e.g. a tree object for a blob, or
|
|
|
|
a commit for another commit that's doesn't have the previous commit as
|
|
|
|
an ancestor etc.
|
|
|
|
+
|
fetch: stop clobbering existing tags without --force
Change "fetch" to treat "+" in refspecs (aka --force) to mean we
should clobber a local tag of the same name.
This changes the long-standing behavior of "fetch" added in
853a3697dc ("[PATCH] Multi-head fetch.", 2005-08-20). Before this
change, all tag fetches effectively had --force enabled. See the
git-fetch-script code in fast_forward_local() with the comment:
> Tags need not be pointing at commits so there is no way to
> guarantee "fast-forward" anyway.
That commit and the rest of the history of "fetch" shows that the
"+" (--force) part of refpecs was only conceived for branch updates,
while tags have accepted any changes from upstream unconditionally and
clobbered the local tag object. Changing this behavior has been
discussed as early as 2011[1].
The current behavior doesn't make sense to me, it easily results in
local tags accidentally being clobbered. We could namespace our tags
per-remote and not locally populate refs/tags/*, but as with my
97716d217c ("fetch: add a --prune-tags option and fetch.pruneTags
config", 2018-02-09) it's easier to work around the current
implementation than to fix the root cause.
So this change implements suggestion #1 from Jeff's 2011 E-Mail[1],
"fetch" now only clobbers the tag if either "+" is provided as part of
the refspec, or if "--force" is provided on the command-line.
This also makes it nicely symmetrical with how "tag" itself works when
creating tags. I.e. we refuse to clobber any existing tags unless
"--force" is supplied. Now we can refuse all such clobbering, whether
it would happen by clobbering a local tag with "tag", or by fetching
it from the remote with "fetch".
Ref updates outside refs/{tags,heads/* are still still not symmetrical
with how "git push" works, as discussed in the recently changed
pull-fetch-param.txt documentation. This change brings the two
divergent behaviors more into line with one another. I don't think
there's any reason "fetch" couldn't fully converge with the behavior
used by "push", but that's a topic for another change.
One of the tests added in 31b808a032 ("clone --single: limit the fetch
refspec to fetched branch", 2012-09-20) is being changed to use
--force where a clone would clobber a tag. This changes nothing about
the existing behavior of the test.
1. https://public-inbox.org/git/20111123221658.GA22313@sigill.intra.peff.net/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-31 20:10:04 +00:00
|
|
|
Unlike when pushing with linkgit:git-push[1], there is no
|
|
|
|
configuration which'll amend these rules, and nothing like a
|
|
|
|
`pre-fetch` hook analogous to the `pre-receive` hook.
|
|
|
|
+
|
2018-08-31 20:10:03 +00:00
|
|
|
As with pushing with linkgit:git-push[1], all of the rules described
|
|
|
|
above about what's not allowed as an update can be overridden by
|
|
|
|
adding an the optional leading `+` to a refspec (or using `--force`
|
|
|
|
command line option). The only exception to this is that no amount of
|
|
|
|
forcing will make the `refs/heads/*` namespace accept a non-commit
|
|
|
|
object.
|
2005-10-03 17:16:30 +00:00
|
|
|
+
|
2005-11-05 02:36:08 +00:00
|
|
|
[NOTE]
|
2014-05-29 19:53:28 +00:00
|
|
|
When the remote branch you want to fetch is known to
|
|
|
|
be rewound and rebased regularly, it is expected that
|
|
|
|
its new tip will not be descendant of its previous tip
|
|
|
|
(as stored in your remote-tracking branch the last time
|
|
|
|
you fetched). You would want
|
|
|
|
to use the `+` sign to indicate non-fast-forward updates
|
|
|
|
will be needed for such branches. There is no way to
|
|
|
|
determine or declare that a branch will be made available
|
|
|
|
in a repository with this behavior; the pulling user simply
|
2005-11-05 02:36:08 +00:00
|
|
|
must know this is the expected usage pattern for a branch.
|
2014-05-29 20:07:44 +00:00
|
|
|
ifdef::git-pull[]
|
2005-11-05 02:36:08 +00:00
|
|
|
+
|
|
|
|
[NOTE]
|
2005-11-05 09:37:00 +00:00
|
|
|
There is a difference between listing multiple <refspec>
|
2010-01-09 23:33:00 +00:00
|
|
|
directly on 'git pull' command line and having multiple
|
2014-05-29 20:07:44 +00:00
|
|
|
`remote.<repository>.fetch` entries in your configuration
|
|
|
|
for a <repository> and running a
|
2010-01-09 23:33:00 +00:00
|
|
|
'git pull' command without any explicit <refspec> parameters.
|
2014-05-29 20:07:44 +00:00
|
|
|
<refspec>s listed explicitly on the command line are always
|
2005-11-05 09:37:00 +00:00
|
|
|
merged into the current branch after fetching. In other words,
|
2014-05-29 20:07:44 +00:00
|
|
|
if you list more than one remote ref, 'git pull' will create
|
|
|
|
an Octopus merge. On the other hand, if you do not list any
|
|
|
|
explicit <refspec> parameter on the command line, 'git pull'
|
|
|
|
will fetch all the <refspec>s it finds in the
|
|
|
|
`remote.<repository>.fetch` configuration and merge
|
|
|
|
only the first <refspec> found into the current branch.
|
|
|
|
This is because making an
|
2005-11-05 09:37:00 +00:00
|
|
|
Octopus from remote refs is rarely done, while keeping track
|
|
|
|
of multiple remote heads in one-go by fetching more than one
|
|
|
|
is often useful.
|
2014-05-29 20:07:44 +00:00
|
|
|
endif::git-pull[]
|