Merge branch 'ps/refstorage-extension' into ps/prompt-parse-HEAD-futureproof

[thirdparty/git.git] / diff-lib.c

diff --git a/diff-lib.c b/diff-lib.c
index 5848e4f9ca294052b0e06c7e4d038ebd462ade92..92aa13789d7192544cfc8d21cefec528ea7445ff 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -38,7 +38,13 @@
  */
 static int check_removed(const struct cache_entry *ce, struct stat *st)
 {
-       if (lstat(ce->name, st) < 0) {
+       int stat_err;
+
+       if (!(ce->ce_flags & CE_FSMONITOR_VALID))
+               stat_err = lstat(ce->name, st);
+       else
+               stat_err = fake_lstat(ce, st);
+       if (stat_err < 0) {
                if (!is_missing_file_error(errno))
                        return -1;
                return 1;
@@ -571,8 +577,6 @@ void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb)
                struct object *obj = revs->pending.objects[i].item;
                if (obj->flags)
                        die(_("--merge-base does not work with ranges"));
-               if (obj->type != OBJ_COMMIT)
-                       die(_("--merge-base only works with commits"));
        }
 
        /*