git-p4: add option to disable syncing of p4/master with p4

diff --git a/http-push.c b/http-push.c
index ff82b63133fe4b3de046e15f1066ce6df27404ac..f308ce0195a5f0991996a3daad9b13809e8f7895 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -6,12 +6,13 @@
 #include "refs.h"
 #include "diff.h"
 #include "revision.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "remote.h"
 #include "list-objects.h"
 #include "sigchain.h"
 #include "argv-array.h"
 #include "packfile.h"
+#include "object-store.h"
 
 #ifdef EXPAT_NEEDS_XMLPARSE_H
 #include <xmlparse.h>