diff options
Diffstat (limited to 'builtin/merge-index.c')
| -rw-r--r-- | builtin/merge-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-index.c b/builtin/merge-index.c index 1c3427c36c..2d1b6db6bd 100644 --- a/builtin/merge-index.c +++ b/builtin/merge-index.c @@ -22,7 +22,7 @@ static int merge_entry(int pos, const char *path) if (strcmp(ce->name, path)) break; found++; - sha1_to_hex_r(hexbuf[stage], ce->sha1); + oid_to_hex_r(hexbuf[stage], &ce->oid); xsnprintf(ownbuf[stage], sizeof(ownbuf[stage]), "%o", ce->ce_mode); arguments[stage] = hexbuf[stage]; arguments[stage + 4] = ownbuf[stage]; |