Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sg/wt-status-header-inclusion' into maint
author
Junio C Hamano
<gitster@pobox.com>
Fri, 4 Sep 2015 02:17:57 +0000
(19:17 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 4 Sep 2015 02:17:57 +0000
(19:17 -0700)
* sg/wt-status-header-inclusion:
wt-status: move #include "pathspec.h" to the header
wt-status.c
patch
|
blob
|
history
wt-status.h
patch
|
blob
|
history
raw
(from parent 1:
659227b
)
diff --git
a/wt-status.c
b/wt-status.c
index eaed4fed32f48f4834afaf47f87bda7ce4794308..e8c39efbcb24203577458662e0ddfe9928a332b7 100644
(file)
--- 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 e0a99f75c745acd3e7fb6fd8aecd06a4d3bd5522..c9b3b744e923f2f559f64f1bf4a1f2159b5060d6 100644
(file)
--- 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,