summaryrefslogtreecommitdiffstats
path: root/read-cache.c
diff options
context:
space:
mode:
authorJaime Soriano Pastor <jsorianopastor@gmail.com>2014-08-27 21:48:12 +0200
committerJunio C Hamano <gitster@pobox.com>2014-08-29 19:05:53 +0200
commit0344d93ced82a5e492d0e2a555047346445d2495 (patch)
treec44e65778ee9a0de1e8e9113aefdd29879f7de9c /read-cache.c
parentread_index_from(): catch out of order entries when reading an index file (diff)
downloadgit-0344d93ced82a5e492d0e2a555047346445d2495.tar.xz
git-0344d93ced82a5e492d0e2a555047346445d2495.zip
read_index_unmerged(): remove unnecessary loop index adjustment
Signed-off-by: Jaime Soriano Pastor <jsorianopastor@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c
index 22b0add52f..771d424b94 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1971,7 +1971,6 @@ int read_index_unmerged(struct index_state *istate)
if (add_index_entry(istate, new_ce, 0))
return error("%s: cannot drop to stage #0",
new_ce->name);
- i = index_name_pos(istate, new_ce->name, len);
}
return unmerged;
}