| commit | 1aad91f5a715af92892aea7764beb829938ab111 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 14 Sep 2007 07:31:07 +0000 (14 03:31 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Sep 2007 10:22:30 +0000 (19 03:22 -0700) | ||
| tree | b24d4768bf14cf11f2987274ab438e9749d4fe8d | treesnapshot (tar.gz zip) |
| parent | b888d61c8308027433df9c243fa551f42db1c76a | commitdiff |
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>
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>
| builtin-fetch.c | diffblobblamehistory |