diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:06 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:07 -0700 |
commit | 6b8aa3294e05bd58758ca0a22689d6666d262ea8 (patch) | |
tree | 977f0ac1896cace2922c06c659aa343b833139fc /diff.c | |
parent | 18c88f9af69ece938083409494fe204fbe376a11 (diff) | |
parent | 7d5e1dc333e9dc2493405c7c6d74f0c0d8b93455 (diff) | |
download | git-6b8aa3294e05bd58758ca0a22689d6666d262ea8.tar.gz |
Merge branch 'po/object-id'
* po/object-id:
sha1_file: convert index_stream to struct object_id
sha1_file: convert hash_sha1_file_literally to struct object_id
sha1_file: convert index_fd to struct object_id
sha1_file: convert index_path to struct object_id
read-cache: convert to struct object_id
builtin/hash-object: convert to struct object_id
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4011,7 +4011,7 @@ static void diff_fill_oid_info(struct diff_filespec *one) } if (lstat(one->path, &st) < 0) die_errno("stat '%s'", one->path); - if (index_path(one->oid.hash, one->path, &st, 0)) + if (index_path(&one->oid, one->path, &st, 0)) die("cannot hash %s", one->path); } } |