Merge branch 'nd/struct-pathspec'

diff --git a/read-cache.c b/read-cache.c
index 7772079ad3101a2a51cfef1c5b1c250ed3ff37de..b97b5668ebc486561686d3e80b536e115dede513 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1083,7 +1083,7 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
 }
 
 static void show_file(const char * fmt, const char * name, int in_porcelain,
-                     int * first, char *header_msg)
+                     int * first, const char *header_msg)
 {
        if (in_porcelain && *first && header_msg) {
                printf("%s\n", header_msg);
@@ -1093,7 +1093,7 @@ static void show_file(const char * fmt, const char * name, int in_porcelain,
 }
 
 int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec,
-                 char *seen, char *header_msg)
+                 char *seen, const char *header_msg)
 {
        int i;
        int has_errors = 0;