Merge branch 'jk/pathspec-magic-disambiguation'

diff --git a/diff-lib.c b/diff-lib.c
index ee9df0f84721914506c6482f7d654c1ee01937ba..76c8f185cd032b92e010b95e4d92e3b08a6ab18a 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -29,7 +29,7 @@
 static int check_removed(const struct cache_entry *ce, struct stat *st)
 {
        if (lstat(ce->name, st) < 0) {
-               if (errno != ENOENT && errno != ENOTDIR)
+               if (!is_missing_file_error(errno))
                        return -1;
                return 1;
        }
@@ -486,7 +486,7 @@ static int diff_cache(struct rev_info *revs,
        struct tree_desc t;
        struct unpack_trees_options opts;
 
-       tree = parse_tree_indirect(tree_oid->hash);
+       tree = parse_tree_indirect(tree_oid);
        if (!tree)
                return error("bad tree object %s",
                             tree_name ? tree_name : oid_to_hex(tree_oid));