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 /merge-recursive.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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ea9dbd307c..f95933b0aa 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -251,7 +251,7 @@ struct tree *write_tree_from_memory(struct merge_options *o) int i; fprintf(stderr, "BUG: There are unmerged index entries:\n"); for (i = 0; i < active_nr; i++) { - struct cache_entry *ce = active_cache[i]; + const struct cache_entry *ce = active_cache[i]; if (ce_stage(ce)) fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce), (int)ce_namelen(ce), ce->name); @@ -264,7 +264,8 @@ struct tree *write_tree_from_memory(struct merge_options *o) if (!cache_tree_fully_valid(active_cache_tree) && cache_tree_update(active_cache_tree, - active_cache, active_nr, 0) < 0) + (const struct cache_entry * const *)active_cache, + active_nr, 0) < 0) die(_("error building trees")); result = lookup_tree(active_cache_tree->sha1); @@ -339,7 +340,7 @@ static struct string_list *get_unmerged(void) for (i = 0; i < active_nr; i++) { struct string_list_item *item; struct stage_data *e; - struct cache_entry *ce = active_cache[i]; + const struct cache_entry *ce = active_cache[i]; if (!ce_stage(ce)) continue; |