Merge branch 'ng/mergetool-lose-final-prompt'

diff --git a/packfile.h b/packfile.h
index e0a38aba9321deae1d64aea7cd87067fde240b10..fa36c473adaf02df7395329587baf07e47febb34 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -1,8 +1,13 @@
 #ifndef PACKFILE_H
 #define PACKFILE_H
 
+#include "cache.h"
 #include "oidset.h"
 
+/* in object-store.h */
+struct packed_git;
+struct object_info;
+
 /*
  * Generate the filename to be used for a pack file with checksum "sha1" and
  * extension "ext". The result is written into the strbuf "buf", overwriting