X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-fetch-pack.c;h=de1e8d1365769c7c841749901f705c0b6a78eab3;hb=4df0d7af6be27fe5b0ffef438ef0169607253f66;hp=fe8cfa0cb899d0db2f572e4fcf859dea9e895197;hpb=72269ad9564b700e6aab30338e35b4e6ffea854d;p=git.git

diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c
index fe8cfa0cb..de1e8d136 100644
--- a/builtin-fetch-pack.c
+++ b/builtin-fetch-pack.c
@@ -123,7 +123,7 @@ static const unsigned char* get_rev(void)
 			return NULL;
 
 		commit = rev_list->item;
-		if (commit->object.parsed)
+		if (!commit->object.parsed)
 			parse_commit(commit);
 		parents = commit->parents;
 
@@ -635,7 +635,7 @@ static int remove_duplicates(int nr_heads, char **heads)
 	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);
@@ -647,7 +647,7 @@ static int fetch_pack_config(const char *var, const char *value)
 		return 0;
 	}
 
-	return git_default_config(var, value);
+	return git_default_config(var, value, cb);
 }
 
 static struct lock_file lock;
@@ -657,7 +657,7 @@ static void fetch_pack_setup(void)
 	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)