Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
read_index_unmerged(): remove unnecessary loop index adjustment
[gitweb.git]
/
read-cache.c
diff --git
a/read-cache.c
b/read-cache.c
index 22b0add52f28cbe3c8dab727a1959d8ba72c4688..771d424b94acd1f6253efbaee44fca43de9076fa 100644
(file)
--- 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;
}