Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
streaming: make stream_blob_to_fd take struct object_id
[gitweb.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index 534c12e28ea8b077c9fa305a634f7a73cf30589d..bba80665bb83d43d2141584a031694d2bb44ec86 100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-2700,7
+2700,7
@@
static int reuse_worktree_file(const char *name, const unsigned char *sha1, int
* This is not the sha1 we are looking for, or
* unreusable because it is not a regular file.
*/
- if (hashcmp(sha1, ce->
sha1
) || !S_ISREG(ce->ce_mode))
+ if (hashcmp(sha1, ce->
oid.hash
) || !S_ISREG(ce->ce_mode))
return 0;
/*