Merge branch 'hv/config-from-blob'

diff --git a/wt-status.c b/wt-status.c
index 9c4d086b51364ff42a044be95e6ea55dffe7b79e..bf1554cc4cfff1b11ddf0845f8d81d8376c8b049 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -372,7 +372,7 @@ static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
 static int unmerged_mask(const char *path)
 {
        int pos, mask;
-       struct cache_entry *ce;
+       const struct cache_entry *ce;
 
        pos = cache_name_pos(path, strlen(path));
        if (0 <= pos)
@@ -476,7 +476,7 @@ static void wt_status_collect_changes_initial(struct wt_status *s)
        for (i = 0; i < active_nr; i++) {
                struct string_list_item *it;
                struct wt_status_change_data *d;
-               struct cache_entry *ce = active_cache[i];
+               const struct cache_entry *ce = active_cache[i];
 
                if (!ce_path_match(ce, &pathspec))
                        continue;