read-tree -m: make error message for merging 0 trees less smart aleck

diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index ce356b1da126e31b4ef78b29dcc49246881b6a59..2d1b6db6bd7a33f838a50deceb108ee1ad468db1 100644 (file)
--- 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->oid.hash);
+               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];