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>
Jaime Soriano Pastor committed
Aug 27, 2014 at 21:48 UTC
0344d93ced82a5e492d0e2a555047346445d2495
1 file changed
-1
read-cache.c
-1
@@ -1971,7 +1971,6 @@ int read_index_unmerged(struct index_state *istate)
1971
if (add_index_entry(istate, new_ce, 0))
1972
return error("%s: cannot drop to stage #0",
1973
new_ce->name);
1974
- i = index_name_pos(istate, new_ce->name, len);
1974
}
1975
return unmerged;
1976
}