diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-09-14 07:31:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-19 10:22:30 (GMT) |
| commit | 1aad91f5a715af92892aea7764beb829938ab111 (patch) | |
| tree | b24d4768bf14cf11f2987274ab438e9749d4fe8d /builtin-fetch.c | |
| parent | b888d61c8308027433df9c243fa551f42db1c76a (diff) | |
| download | git-1aad91f5a715af92892aea7764beb829938ab111.zip git-1aad91f5a715af92892aea7764beb829938ab111.tar.gz git-1aad91f5a715af92892aea7764beb829938ab111.tar.bz2 | |
Correct builtin-fetch to handle + in refspecs
If we are fetching to a local reference (the so called peer_ref) and
the refspec that created this ref/peer_ref association had started
with '+' we are supposed to allow a non-fast-forward update during
fetch, even if --force was not supplied on the command line. The
builtin-fetch implementation was not honoring this setting as it
was copied from the wrong struct ref instance.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-fetch.c')
| -rw-r--r-- | builtin-fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index 64392f3..c8c24d2 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -217,7 +217,7 @@ static void store_updated_refs(const char *url, struct ref *ref_map) strcpy(ref->name, rm->peer_ref->name); hashcpy(ref->old_sha1, rm->peer_ref->old_sha1); hashcpy(ref->new_sha1, rm->old_sha1); - ref->force = rm->force; + ref->force = rm->peer_ref->force; } commit = lookup_commit_reference(rm->old_sha1); |