diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:24:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:24:01 -0700 |
| commit | d3aeb31dc410a71ee41b87328f0d71996417294f (patch) | |
| tree | c9792a61c95180c0eeb4c85f5c97fbde63aa53d0 /wt-status.c | |
| parent | e9f1a6c189c34a7ea98cbdb92acc677a72a5b4ea (diff) | |
| parent | 9c5e6c802cde9881785b7f1b3278b97be4aabd82 (diff) | |
| download | git-d3aeb31dc410a71ee41b87328f0d71996417294f.tar.gz | |
Merge branch 'nd/const-struct-cache-entry'
* nd/const-struct-cache-entry:
Convert "struct cache_entry *" to "const ..." wherever possible
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index 9c4d086b51..bf1554cc4c 100644 --- 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; |