diff options
| author | René Scharfe <l.s.r@web.de> | 2017-01-28 23:03:03 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-30 23:23:40 +0100 |
| commit | 2490574d15cab6e8d955dc4132cf9e7e83fc1172 (patch) | |
| tree | 6971968ee9acbd6f3ca9d490a1a8fcbaeeec611c /builtin/merge-index.c | |
| parent | Seventh batch for 2.12 (diff) | |
| download | git-2490574d15cab6e8d955dc4132cf9e7e83fc1172.tar.xz git-2490574d15cab6e8d955dc4132cf9e7e83fc1172.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-index.c b/builtin/merge-index.c index ce356b1da1..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->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]; |