Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18n

diff --git a/diff.c b/diff.c
index b4310f814c1237ef457510c33f64738a07652e44..c6da383c563c6cf248843e59ccb38c4ea24fd1f7 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2703,7 +2703,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;
 
        /*