projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of .
[git.git]
/
connect.c
diff --git
a/connect.c
b/connect.c
index
c0bf869
..
825c439
100644
(file)
--- 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;
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;
static struct refspec *parse_ref_spec(int nr_refspec, char **refspec)
{
int i;
- struct refspec *rs = x
malloc(sizeof(*rs) *
(nr_refspec + 1));
+ struct refspec *rs = x
calloc(sizeof(*rs),
(nr_refspec + 1));
for (i = 0; i < nr_refspec; i++) {
char *sp, *dp, *ep;
sp = refspec[i];
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;
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);
}
error("dst ref %s receives from more than one src.",
matched_dst->name);
}
- else
+ else
{
matched_dst->peer_ref = matched_src;
matched_dst->peer_ref = matched_src;
+ matched_dst->force = rs[i].force;
+ }
}
return -errs;
}
}
return -errs;
}