Add initial support for many promisor remotes

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 53188df71438ad83186bcae37a8742704ae048a5..16eb8b70ea33eb00516d7ab035a90df9728d5296 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -727,7 +727,8 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
                setup_work_tree();
                setenv(GIT_DIR_ENVIRONMENT, absolute_path(get_git_dir()), 1);
                setenv(GIT_WORK_TREE_ENVIRONMENT, absolute_path(get_git_work_tree()), 1);
-       }
+       } else if (dir_diff)
+               die(_("--dir-diff is incompatible with --no-index"));
 
        if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)
                die(_("--gui, --tool and --extcmd are mutually exclusive"));