summaryrefslogtreecommitdiffstats
path: root/remote.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-10-19 11:04:00 +0200
committerShawn O. Pearce <spearce@spearce.org>2007-10-20 04:59:10 +0200
commit5eb73581679abb41dcdf9ad7fa63fa156e078790 (patch)
tree4b93fe6adafeb10894845f6d77794d0bc4650f4a /remote.c
parentPaper bag fix diff invocation in 'git stash show' (diff)
downloadgit-5eb73581679abb41dcdf9ad7fa63fa156e078790.tar.xz
git-5eb73581679abb41dcdf9ad7fa63fa156e078790.zip
send-pack: respect '+' on wildcard refspecs
When matching source and destination refs, we were failing to pull the 'force' parameter from wildcard refspecs (but not explicit ones) and attach it to the ref struct. This adds a test for explicit and wildcard refspecs; the latter fails without this patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/remote.c b/remote.c
index bb774d0bcc..cdbbdcb00d 100644
--- a/remote.c
+++ b/remote.c
@@ -626,6 +626,8 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
hashcpy(dst_peer->new_sha1, src->new_sha1);
}
dst_peer->peer_ref = src;
+ if (pat)
+ dst_peer->force = pat->force;
free_name:
free(dst_name);
}