From: Michael Haggerty <mhagger@xxxxxxxxxxxx>
Remove any references that were received from the remote from the list
(*nr_heads, heads) of requested references by squeezing them out of
the list (rather than overwriting their names with NUL characters, as
before). On exit, *nr_heads is the number of requested references
that were not received.
Document this aspect of fetch_pack() in a comment in the header file.
(More documentation is obviously still needed.)
Signed-off-by: Michael Haggerty <mhagger@xxxxxxxxxxxx>
---
builtin/fetch-pack.c | 21 +++++++++++++--------
fetch-pack.h | 6 ++++++
transport.c | 3 ++-
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 8366012..cc9af80 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -527,7 +527,7 @@ static void filter_refs(struct ref **refs, int *nr_heads, char **heads)
struct ref *newlist = NULL;
struct ref **newtail = &newlist;
struct ref *ref, *next;
- int match_pos = 0, matched = 0;
+ int match_pos = 0, matched = 0, unmatched = 0;
if (*nr_heads && !args.fetch_all)
return_refs = xcalloc(*nr_heads, sizeof(struct ref *));
@@ -554,11 +554,12 @@ static void filter_refs(struct ref **refs, int *nr_heads, char **heads)
break;
else if (cmp == 0) { /* definitely have it */
return_refs[matched++] = ref;
- heads[match_pos++][0] = '\0';
+ match_pos++;
break;
}
- else /* might have it; keep looking */
- match_pos++;
+ else { /* might have it; keep looking */
+ heads[unmatched++] = heads[match_pos++];
+ }
}
if (!cmp)
continue; /* we will link it later */
@@ -568,6 +569,12 @@ static void filter_refs(struct ref **refs, int *nr_heads, char **heads)
if (!args.fetch_all) {
int i;
+
+ /* copy remaining unmatched heads: */
+ while (match_pos < *nr_heads)
+ heads[unmatched++] = heads[match_pos++];
+ *nr_heads = unmatched;
+
for (i = 0; i < matched; i++) {
ref = return_refs[i];
*newtail = ref;
@@ -1028,10 +1035,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
* silently succeed without issuing an error.
*/
for (i = 0; i < nr_heads; i++)
- if (heads[i] && heads[i][0]) {
- error("no such remote ref %s", heads[i]);
- ret = 1;
- }
+ error("no such remote ref %s", heads[i]);
+ ret = 1;
}
while (ref) {
printf("%s %s\n",
diff --git a/fetch-pack.h b/fetch-pack.h
index a9d505b..915858e 100644
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -17,6 +17,12 @@ struct fetch_pack_args {
stateless_rpc:1;
};
+/*
+ * (*nr_heads, heads) is an array of pointers to the full names of
+ * remote references that should be updated from. On return, both
+ * will have been changed to list only the names that were not found
+ * on the remote.
+ */
struct ref *fetch_pack(struct fetch_pack_args *args,
int fd[], struct child_process *conn,
const struct ref *ref,
diff --git a/transport.c b/transport.c
index f7bbf58..3c38d44 100644
--- a/transport.c
+++ b/transport.c
@@ -520,6 +520,7 @@ static int fetch_refs_via_pack(struct transport *transport,
struct git_transport_data *data = transport->data;
char **heads = xmalloc(nr_heads * sizeof(*heads));
char **origh = xmalloc(nr_heads * sizeof(*origh));
+ int orig_nr_heads = nr_heads;
const struct ref *refs;
char *dest = xstrdup(transport->url);
struct fetch_pack_args args;
@@ -558,7 +559,7 @@ static int fetch_refs_via_pack(struct transport *transport,
free_refs(refs_tmp);
- for (i = 0; i < nr_heads; i++)
+ for (i = 0; i < orig_nr_heads; i++)
free(origh[i]);
free(origh);
free(heads);
--
1.7.11.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html