Merge branch 'virtualfilesystem-and-merge-recursive'

The major work on merge-recursive.c that went into v2.21.0 necessitates
an adjustment to work well with VFSforGit's virtualfilesystem hook.

Author: dscho

merge-recursive.c

@@ -29,6 +29,7 @@
 #include "tree-walk.h"
 #include "unpack-trees.h"
 #include "xdiff-interface.h"
+#include "virtualfilesystem.h"
 
 struct merge_options_internal {
 	int call_depth;
@@ -857,15 +858,14 @@ static int would_lose_untracked(struct merge_options *opt, const char *path)
 static int was_dirty(struct merge_options *opt, const char *path)
 {
 	struct cache_entry *ce;
-	int dirty = 1;
 
-	if (opt->priv->call_depth || !was_tracked(opt, path))
-		return !dirty;
+	if (opt->priv->call_depth || !was_tracked(opt, path) ||
+	    is_excluded_from_virtualfilesystem(path, strlen(path), DT_REG) == 1)
+		return 0;
 
 	ce = index_file_exists(opt->priv->unpack_opts.src_index,
 			       path, strlen(path), ignore_case);
-	dirty = verify_uptodate(ce, &opt->priv->unpack_opts) != 0;
-	return dirty;
+	return !ce || verify_uptodate(ce, &opt->priv->unpack_opts) != 0;
 }
 
 static int make_room_for_path(struct merge_options *opt, const char *path)