Merge branch 'bc/object-id'

diff --git a/diff.c b/diff.c
index 485ff6c264e1d4edd2cddb47a6f5beae96d26a13..d20614605e6f50a0e693dcda9499452475000d31 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -13,6 +13,7 @@
 #include "attr.h"
 #include "run-command.h"
 #include "utf8.h"
+#include "object-store.h"
 #include "userdiff.h"
 #include "submodule-config.h"
 #include "submodule.h"