From: Jaime Soriano Pastor <jsorianopastor@gmail.com>
Date: Wed, 27 Aug 2014 19:48:12 +0000 (+0200)
Subject: read_index_unmerged(): remove unnecessary loop index adjustment
X-Git-Tag: v2.2.0-rc0~117^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0344d93ced82a5e492d0e2a555047346445d2495

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>
---

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;
 }