From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Aug 2015 22:45:38 +0000 (-0700)
Subject: Merge branch 'sg/wt-status-header-inclusion'
X-Git-Tag: v2.6.0-rc0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/65254961729026a7ea6904eafecf52fb99bd3769?hp=cfcd38f5529a804ee7c377662aeb8384e94dc3ea

Merge branch 'sg/wt-status-header-inclusion'

* sg/wt-status-header-inclusion:
wt-status: move #include "pathspec.h" to the header
---

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,