summaryrefslogtreecommitdiff
path: root/apply.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-20 12:41:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-20 12:41:32 -0700
commit5ade03446430f1190fdf1eca8b8fde5f63367110 (patch)
treeba0c1878e9d5c96cfcb9668a3756a80b73600789 /apply.h
parentMerge branch 'jt/repack-promisor-packs' (diff)
parentRemove forward declaration of an enum (diff)
downloadtgif-5ade03446430f1190fdf1eca8b8fde5f63367110.tar.xz
Merge branch 'en/incl-forward-decl'
Code hygiene improvement for the header files. * en/incl-forward-decl: Remove forward declaration of an enum compat/precompose_utf8.h: use more common include guard style urlmatch.h: fix include guard Move definition of enum branch_track from cache.h to branch.h alloc: make allocate_alloc_state and clear_alloc_state more consistent Add missing includes and forward declarations
Diffstat (limited to 'apply.h')
-rw-r--r--apply.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/apply.h b/apply.h
index 78c8bcfc3c..5948348133 100644
--- a/apply.h
+++ b/apply.h
@@ -1,6 +1,9 @@
#ifndef APPLY_H
#define APPLY_H
+#include "lockfile.h"
+#include "string-list.h"
+
struct repository;
enum apply_ws_error_action {