summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-24 07:40:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-24 23:50:53 (GMT)
commitff27adf3dae36695f1af1b6f0e01ec6738ce0249 (patch)
tree676ccf3206efd6b7335a630185b08211c16b2918 /connect.c
parentefe9bf0f3b34d12b3b76f8277550f91700609b25 (diff)
downloadgit-ff27adf3dae36695f1af1b6f0e01ec6738ce0249.zip
git-ff27adf3dae36695f1af1b6f0e01ec6738ce0249.tar.gz
git-ff27adf3dae36695f1af1b6f0e01ec6738ce0249.tar.bz2
Support +<src>:<dst> format in push as well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'connect.c')
-rw-r--r--connect.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/connect.c b/connect.c
index a6657b1..7cd5873 100644
--- a/connect.c
+++ b/connect.c
@@ -82,15 +82,26 @@ int path_match(const char *path, int nr, char **match)
struct refspec {
char *src;
char *dst;
+ char force;
};
+/*
+ * A:B means fast forward remote B with local A.
+ * +A:B means overwrite remote B with local A.
+ * +A is a shorthand for +A:A.
+ * A is a shorthand for A:A.
+ */
static struct refspec *parse_ref_spec(int nr_refspec, char **refspec)
{
int i;
- struct refspec *rs = xmalloc(sizeof(*rs) * (nr_refspec + 1));
+ struct refspec *rs = xcalloc(sizeof(*rs), (nr_refspec + 1));
for (i = 0; i < nr_refspec; i++) {
char *sp, *dp, *ep;
sp = refspec[i];
+ if (*sp == '+') {
+ rs[i].force = 1;
+ sp++;
+ }
ep = strchr(sp, ':');
if (ep) {
dp = ep + 1;
@@ -216,8 +227,10 @@ static int match_explicit_refs(struct ref *src, struct ref *dst,
error("dst ref %s receives from more than one src.",
matched_dst->name);
}
- else
+ else {
matched_dst->peer_ref = matched_src;
+ matched_dst->force = rs[i].force;
+ }
}
return -errs;
}