projects
/
git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
builtin rebase: use no-op editor when interactive is "implied"
[git]
/
resolve-undo.c
diff --git
a/resolve-undo.c
b/resolve-undo.c
index
fc5b3b8
..
c30ae5c
100644
(file)
--- a/
resolve-undo.c
+++ b/
resolve-undo.c
@@
-146,7
+146,9
@@
int unmerge_index_entry_at(struct index_state *istate, int pos)
struct cache_entry *nce;
if (!ru->mode[i])
continue;
- nce = make_cache_entry(ru->mode[i], ru->oid[i].hash,
+ nce = make_cache_entry(istate,
+ ru->mode[i],
+ &ru->oid[i],
name, i + 1, 0);
if (matched)
nce->ce_flags |= CE_MATCHED;