summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-08-15 17:54:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-15 18:52:09 (GMT)
commitef3ca95475ce467ae883cc8175ed40e6f7d27800 (patch)
treefe44271647b22756c3d53225658287119a3c34cd /notes-merge.h
parent1d89318c48d233d52f1db230cf622935ac3c69fa (diff)
downloadgit-ef3ca95475ce467ae883cc8175ed40e6f7d27800.zip
git-ef3ca95475ce467ae883cc8175ed40e6f7d27800.tar.gz
git-ef3ca95475ce467ae883cc8175ed40e6f7d27800.tar.bz2
Add missing includes and forward declarations
I looped over the toplevel header files, creating a temporary two-line C program for each consisting of #include "git-compat-util.h" #include $HEADER This patch is the result of manually fixing errors in compiling those tiny programs. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.h')
-rw-r--r--notes-merge.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/notes-merge.h b/notes-merge.h
index f815f23..6c74e93 100644
--- 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"