Merge branch 'master' into next

diff --git a/prune-packed.c b/prune-packed.c
index 16685d1d8b25358f8df45a92262b4b0f6ea9cef5..d24b097114ef2610416b106ea9aa2000873924f3 100644 (file)
--- a/prune-packed.c
+++ b/prune-packed.c
@@ -58,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];
 
@@ -71,6 +73,7 @@ int main(int argc, char **argv)
                /* Handle arguments here .. */
                usage(prune_packed_usage);
        }
+       sync();
        prune_packed_objects();
        return 0;
 }