diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-03 11:25:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-03 11:25:19 -0800 |
| commit | 36acf41239a7406d52faf1b6c757ffe34e3be98d (patch) | |
| tree | 47d07010f6c7c0fa066105f034759398dc767993 /diff.c | |
| parent | ecc486b1f8ad5962ed51bcbffbba75ff2bc633ad (diff) | |
| parent | 0ce11fe951e3a1ba73b940563a4227cf45461489 (diff) | |
| download | git-36acf41239a7406d52faf1b6c757ffe34e3be98d.tar.gz | |
Merge branch 'rs/object-id'
"uchar [40]" to "struct object_id" conversion continues.
* rs/object-id:
checkout: convert post_checkout_hook() to struct object_id
use oidcpy() for copying hashes between instances of struct object_id
use oid_to_hex_r() for converting struct object_id hashes to hex strings
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3015,7 +3015,7 @@ static struct diff_tempfile *prepare_temp_file(const char *name, if (!one->oid_valid) sha1_to_hex_r(temp->hex, null_sha1); else - sha1_to_hex_r(temp->hex, one->oid.hash); + oid_to_hex_r(temp->hex, &one->oid); /* Even though we may sometimes borrow the * contents from the work tree, we always want * one->mode. mode is trustworthy even when |