Merge branch 'maint'

diff --git a/receive-pack.c b/receive-pack.c
index b26f2e3a41c870d1b73690e389dbd74a8b8a40a0..d44c19e6b577023dcbaa188a0e67130ff4e5bd9a 100644 (file)
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -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,7 +482,7 @@ int main(int argc, char **argv)
        if (!dir)
                usage(receive_pack_usage);
 
-       setup_path(NULL);
+       setup_path();
 
        if (!enter_repo(dir, 0))
                die("'%s': unable to chdir or not a git archive", dir);