diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c
index fe8cfa0cb899d0db2f572e4fcf859dea9e895197..de1e8d1365769c7c841749901f705c0b6a78eab3 100644 (file)
--- a/builtin-fetch-pack.c
+++ b/builtin-fetch-pack.c
return NULL;
commit = rev_list->item;
return NULL;
commit = rev_list->item;
- if (commit->object.parsed)
+ if (!commit->object.parsed)
parse_commit(commit);
parents = commit->parents;
parse_commit(commit);
parents = commit->parents;
return dst;
}
return dst;
}
-static int fetch_pack_config(const char *var, const char *value)
+static int fetch_pack_config(const char *var, const char *value, void *cb)
{
if (strcmp(var, "fetch.unpacklimit") == 0) {
fetch_unpack_limit = git_config_int(var, value);
{
if (strcmp(var, "fetch.unpacklimit") == 0) {
fetch_unpack_limit = git_config_int(var, value);
return 0;
}
return 0;
}
- return git_default_config(var, value);
+ return git_default_config(var, value, cb);
}
static struct lock_file lock;
}
static struct lock_file lock;
static int did_setup;
if (did_setup)
return;
static int did_setup;
if (did_setup)
return;
- git_config(fetch_pack_config);
+ git_config(fetch_pack_config, NULL);
if (0 <= transfer_unpack_limit)
unpack_limit = transfer_unpack_limit;
else if (0 <= fetch_unpack_limit)
if (0 <= transfer_unpack_limit)
unpack_limit = transfer_unpack_limit;
else if (0 <= fetch_unpack_limit)