Merge pull request #2175 from dscho/difftool-no-index

Allow `git difftool --no-index` to run outside of a worktree
git-for-windows · May 10, 2019 · aaa144a · aaa144a
2 parents 3080a82 + 261b652
commit aaa144a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/builtin/difftool.c b/builtin/difftool.c
@@ -733,7 +733,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 && diff_gui_tool && *diff_gui_tool)
 		setenv("GIT_DIFF_TOOL", diff_gui_tool, 1);