Merge branch 'maint'

diff --git a/upload-pack.c b/upload-pack.c
index 9f82941f8b1e1cd65ebcd7675f7b7ba63c24acae..c911e70c9aa47b70dac41b7f4de2f0b4b6c1f948 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -638,7 +638,7 @@ int main(int argc, char **argv)
        if (i != argc-1)
                usage(upload_pack_usage);
 
-       setup_path(NULL);
+       setup_path();
 
        dir = argv[i];