Merge branch 'jc/maint-co-track' into maint

diff --git a/receive-pack.c b/receive-pack.c
index 0ca2a80bf00b76a2b07b749bb1ff7cb77d44f7ee..d44c19e6b577023dcbaa188a0e67130ff4e5bd9a 100644 (file)
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -10,7 +10,7 @@
 static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
 
 static int deny_non_fast_forwards = 0;
-static int receive_fsck_objects = 1;
+static int receive_fsck_objects;
 static int receive_unpack_limit = -1;
 static int transfer_unpack_limit = -1;
 static int unpack_limit = 100;
@@ -19,7 +19,7 @@ static int report_status;
 static char capabilities[] = " report-status delete-refs ";
 static int capabilities_sent;
 
-static int receive_pack_config(const char *var, const char *value)
+static int receive_pack_config(const char *var, const char *value, void *cb)
 {
        if (strcmp(var, "receive.denynonfastforwards") == 0) {
                deny_non_fast_forwards = git_config_bool(var, value);
@@ -41,7 +41,7 @@ static int receive_pack_config(const char *var, const char *value)
                return 0;
        }
 
-       return git_default_config(var, value);
+       return git_default_config(var, value, cb);
 }
 
 static int show_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
@@ -370,7 +370,8 @@ static const char *unpack(void)
        hdr_err = parse_pack_header(&hdr);
        if (hdr_err)
                return hdr_err;
-       snprintf(hdr_arg, sizeof(hdr_arg), "--pack_header=%u,%u",
+       snprintf(hdr_arg, sizeof(hdr_arg),
+                       "--pack_header=%"PRIu32",%"PRIu32,
                        ntohl(hdr.hdr_version), ntohl(hdr.hdr_entries));
 
        if (ntohl(hdr.hdr_entries) < unpack_limit) {
@@ -481,13 +482,15 @@ int main(int argc, char **argv)
        if (!dir)
                usage(receive_pack_usage);
 
+       setup_path();
+
        if (!enter_repo(dir, 0))
                die("'%s': unable to chdir or not a git archive", dir);
 
        if (is_repository_shallow())
                die("attempt to push into a shallow repository");
 
-       git_config(receive_pack_config);
+       git_config(receive_pack_config, NULL);
 
        if (0 <= transfer_unpack_limit)
                unpack_limit = transfer_unpack_limit;