Merge branch 'maint'

diff --git a/wt-status.c b/wt-status.c
index 1b6df45450c39c0f456df68485b5735950816ac8..0ca4b13c29ee6a8cebc1db4ec59f543aef299484 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -13,7 +13,7 @@
 
 int wt_status_relative_paths = 1;
 int wt_status_use_color = -1;
-int wt_status_submodule_summary;
+static int wt_status_submodule_summary;
 static char wt_status_colors[][COLOR_MAXLEN] = {
        GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
        GIT_COLOR_GREEN,  /* WT_STATUS_UPDATED */