Merge branch 'mm/status-push-pull-advise'

diff --git a/read-cache.c b/read-cache.c
index 79e3bbe0240e16629e8ba4b755d60f986132802a..fda78bc353afcfd4d01864f2a13158d9c9c55173 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -424,7 +424,7 @@ int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
        return cache_name_stage_compare(name1, len1, 0, name2, len2, 0);
 }
 
-int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
+static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
 {
        int first, last;