diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 18:24:00 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 18:24:01 (GMT) |
commit | d3aeb31dc410a71ee41b87328f0d71996417294f (patch) | |
tree | c9792a61c95180c0eeb4c85f5c97fbde63aa53d0 /rerere.c | |
parent | e9f1a6c189c34a7ea98cbdb92acc677a72a5b4ea (diff) | |
parent | 9c5e6c802cde9881785b7f1b3278b97be4aabd82 (diff) | |
download | git-d3aeb31dc410a71ee41b87328f0d71996417294f.zip git-d3aeb31dc410a71ee41b87328f0d71996417294f.tar.gz git-d3aeb31dc410a71ee41b87328f0d71996417294f.tar.bz2 |
Merge branch 'nd/const-struct-cache-entry'
* nd/const-struct-cache-entry:
Convert "struct cache_entry *" to "const ..." wherever possible
Diffstat (limited to 'rerere.c')
-rw-r--r-- | rerere.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -299,7 +299,7 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu { mmfile_t mmfile[3] = {{NULL}}; mmbuffer_t result = {NULL, 0}; - struct cache_entry *ce; + const struct cache_entry *ce; int pos, len, i, hunk_no; struct rerere_io_mem io; int marker_size = ll_merge_marker_size(path); @@ -359,7 +359,7 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu static int check_one_conflict(int i, int *type) { - struct cache_entry *e = active_cache[i]; + const struct cache_entry *e = active_cache[i]; if (!ce_stage(e)) { *type = RESOLVED; @@ -374,8 +374,8 @@ static int check_one_conflict(int i, int *type) /* Only handle regular files with both stages #2 and #3 */ if (i + 1 < active_nr) { - struct cache_entry *e2 = active_cache[i]; - struct cache_entry *e3 = active_cache[i + 1]; + const struct cache_entry *e2 = active_cache[i]; + const struct cache_entry *e3 = active_cache[i + 1]; if (ce_stage(e2) == 2 && ce_stage(e3) == 3 && ce_same_name(e, e3) && @@ -398,7 +398,7 @@ static int find_conflict(struct string_list *conflict) for (i = 0; i < active_nr;) { int conflict_type; - struct cache_entry *e = active_cache[i]; + const struct cache_entry *e = active_cache[i]; i = check_one_conflict(i, &conflict_type); if (conflict_type == THREE_STAGED) string_list_insert(conflict, (const char *)e->name); @@ -414,7 +414,7 @@ int rerere_remaining(struct string_list *merge_rr) for (i = 0; i < active_nr;) { int conflict_type; - struct cache_entry *e = active_cache[i]; + const struct cache_entry *e = active_cache[i]; i = check_one_conflict(i, &conflict_type); if (conflict_type == PUNTED) string_list_insert(merge_rr, (const char *)e->name); |