Merge branch 'jc/clone' into next

diff --git a/prune-packed.c b/prune-packed.c
index 1e0fc0cd9e9694c0bad54e26367097cc499bf3d2..d24b097114ef2610416b106ea9aa2000873924f3 100644 (file)
--- a/prune-packed.c
+++ b/prune-packed.c
@@ -27,8 +27,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len)
                        error("unable to unlink %s", pathname);
        }
        pathname[len] = 0;
-       if (!rmdir(pathname))
-               mkdir(pathname, 0777);
+       rmdir(pathname);
 }
 
 static void prune_packed_objects(void)
@@ -59,6 +58,8 @@ int main(int argc, char **argv)
 {
        int i;
 
+       setup_git_directory();
+
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
 
@@ -72,6 +73,7 @@ int main(int argc, char **argv)
                /* Handle arguments here .. */
                usage(prune_packed_usage);
        }
+       sync();
        prune_packed_objects();
        return 0;
 }