read_index_unmerged(): remove unnecessary loop index adjustment
authorJaime Soriano Pastor <jsorianopastor@gmail.com>
Wed, 27 Aug 2014 19:48:12 +0000 (21:48 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Aug 2014 17:05:53 +0000 (10:05 -0700)
Signed-off-by: Jaime Soriano Pastor <jsorianopastor@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
read-cache.c
index 22b0add52f28cbe3c8dab727a1959d8ba72c4688..771d424b94acd1f6253efbaee44fca43de9076fa 100644 (file)
@@ -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;
 }