summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 18:24:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-22 18:24:01 (GMT)
commitd3aeb31dc410a71ee41b87328f0d71996417294f (patch)
treec9792a61c95180c0eeb4c85f5c97fbde63aa53d0 /builtin/merge-index.c
parente9f1a6c189c34a7ea98cbdb92acc677a72a5b4ea (diff)
parent9c5e6c802cde9881785b7f1b3278b97be4aabd82 (diff)
downloadgit-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 'builtin/merge-index.c')
-rw-r--r--builtin/merge-index.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index be5e514..b416d92 100644
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -16,7 +16,7 @@ static int merge_entry(int pos, const char *path)
die("git merge-index: %s not in the cache", path);
found = 0;
do {
- struct cache_entry *ce = active_cache[pos];
+ const struct cache_entry *ce = active_cache[pos];
int stage = ce_stage(ce);
if (strcmp(ce->name, path))
@@ -58,7 +58,7 @@ static void merge_all(void)
{
int i;
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))
continue;
i += merge_entry(i, ce->name)-1;