Merge branch 'nd/const-struct-cache-entry'

* nd/const-struct-cache-entry: Convert "struct cache_entry *" to "const ..." wherever possible
2013-07-22 11:24:00 -07:00
parent e9f1a6c189 9c5e6c802c
commit d3aeb31dc4
29 changed files with 93 additions and 85 deletions
--- a/builtin/merge.c
+++ b/builtin/merge.c
@ -903,7 +903,7 @@ static int suggest_conflicts(int renormalizing)
 		die_errno(_("Could not open '%s' for writing"), filename);
 	fprintf(fp, "\nConflicts:\n");
 	for (pos = 0; pos < active_nr; pos++) {
-		struct cache_entry *ce = active_cache[pos];
+		const struct cache_entry *ce = active_cache[pos];

 		if (ce_stage(ce)) {
 			fprintf(fp, "\t%s\n", ce->name);