summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2017-01-28 22:03:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-01-30 22:23:40 (GMT)
commit2490574d15cab6e8d955dc4132cf9e7e83fc1172 (patch)
tree6971968ee9acbd6f3ca9d490a1a8fcbaeeec611c /builtin/merge-index.c
parent4e59582ff70d299f5a88449891e78d15b4b3fabe (diff)
downloadgit-2490574d15cab6e8d955dc4132cf9e7e83fc1172.zip
git-2490574d15cab6e8d955dc4132cf9e7e83fc1172.tar.gz
git-2490574d15cab6e8d955dc4132cf9e7e83fc1172.tar.bz2
use oid_to_hex_r() for converting struct object_id hashes to hex strings
Patch generated by Coccinelle and contrib/coccinelle/object_id.cocci. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-index.c')
-rw-r--r--builtin/merge-index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index ce356b1..2d1b6db 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->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];