summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-03 19:17:57 -0700
committerJunio C Hamano <gitster@pobox.com>2015-09-03 19:17:57 -0700
commitdc4e7b024436694fe380ef8edd51a307107e959f (patch)
tree8a16d8a922195dccc8c550da388a79fa8935436d
parent659227be2ec065c87d9172a775311cfcd9dc7d3a (diff)
parent7aa9b9ba02c5cfab5078cc7a7b250bbbb74b316f (diff)
downloadgit-dc4e7b024436694fe380ef8edd51a307107e959f.tar.gz
Merge branch 'sg/wt-status-header-inclusion' into maint
* 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 eaed4fed32..e8c39efbcb 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,