Merge branch 'jk/detect-truncated-zlib-input' into maint

diff --git a/notes-merge.h b/notes-merge.h
index f815f23451b4fc8c8a88be0f9475890d8c84c60f..6c74e9385b83ce317d6ca91f328c7790d0753e2c 100644 (file)
--- a/notes-merge.h
+++ b/notes-merge.h
@@ -2,6 +2,10 @@
 #define NOTES_MERGE_H
 
 #include "notes-utils.h"
+#include "strbuf.h"
+
+struct commit;
+struct object_id;
 
 #define NOTES_MERGE_WORKTREE "NOTES_MERGE_WORKTREE"