summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-26 15:45:38 -0700
committerJunio C Hamano <gitster@pobox.com>2015-08-26 15:45:38 -0700
commit65254961729026a7ea6904eafecf52fb99bd3769 (patch)
tree9e1dc3a66d37f3d2615f3f1cd27820b16a24ed8a
parentcfcd38f5529a804ee7c377662aeb8384e94dc3ea (diff)
parent7aa9b9ba02c5cfab5078cc7a7b250bbbb74b316f (diff)
downloadgit-65254961729026a7ea6904eafecf52fb99bd3769.tar.gz
Merge branch 'sg/wt-status-header-inclusion'
* sg/wt-status-header-inclusion: wt-status: move #include "pathspec.h" to the header
-rw-r--r--wt-status.c1
-rw-r--r--wt-status.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c
index 717fd48d13..c327fe8128 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1,5 +1,4 @@
#include "cache.h"
-#include "pathspec.h"
#include "wt-status.h"
#include "object.h"
#include "dir.h"
diff --git a/wt-status.h b/wt-status.h
index e0a99f75c7..c9b3b744e9 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -4,6 +4,7 @@
#include <stdio.h>
#include "string-list.h"
#include "color.h"
+#include "pathspec.h"
enum color_wt_status {
WT_STATUS_HEADER = 0,