mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read_index_unmerged(): remove unnecessary loop index adjustment

Browse Source 
Signed-off-by: Jaime Soriano Pastor <jsorianopastor@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jaime Soriano Pastor
2014-08-27 21:48:12 +02:00
committed by Junio C Hamano
parent 15999d0be8
commit 0344d93ced
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
read-cache.c
View File

@ -1971,7 +1971,6 @@ int read_index_unmerged(struct index_state *istate)
if (add_index_entry(istate, new_ce, 0)) if (add_index_entry(istate, new_ce, 0))
return error("%s: cannot drop to stage #0", return error("%s: cannot drop to stage #0",
new_ce->name); new_ce->name);
i = index_name_pos(istate, new_ce->name, len);
} }
return unmerged; return unmerged;
} }