From: Jaime Soriano Pastor Date: Sun, 24 Aug 2014 17:57:27 GMT Subject: [PATCH 2/2] Loop index increases monotonically when reading unmerged entries Message-ID: <1408903047-8302-2-git-send-email-jsorianopastor@gmail.com> In-Reply-To: <1408903047-8302-1-git-send-email-jsorianopastor@gmail.com> Signed-off-by: Jaime Soriano Pastor --- read-cache.c | 1 - 1 file changed, 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index c1a9619..3d70386 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; } -- 2.0.4.1.g0b8a4f9.dirty