Merge branch 'np/delta' into next

diff --git a/update-server-info.c b/update-server-info.c
index b70856373fce5c014bf796f07d7b1d95bb9eeca1..0b6c3835bd19241ff447c37f442de75791186020 100644 (file)
--- a/update-server-info.c
+++ b/update-server-info.c
@@ -1,5 +1,4 @@
 #include "cache.h"
-#include "object.h"
 
 static const char update_server_info_usage[] =
 "git-update-server-info [--force]";
@@ -8,8 +7,6 @@ int main(int ac, char **av)
 {
        int i;
        int force = 0;
-       track_object_refs = 0;
-
        for (i = 1; i < ac; i++) {
                if (av[i][0] == '-') {
                        if (!strcmp("--force", av[i]) ||
@@ -22,5 +19,7 @@ int main(int ac, char **av)
        if (i != ac)
                usage(update_server_info_usage);
 
+       setup_git_directory();
+
        return !!update_server_info(force);
 }