Browse Source

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>
maint
Jaime Soriano Pastor 11 years ago committed by Junio C Hamano
parent
commit
0344d93ced
  1. 1
      read-cache.c

1
read-cache.c

@ -1971,7 +1971,6 @@ int read_index_unmerged(struct index_state *istate) @@ -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;
}

Loading…
Cancel
Save