diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-08 23:52:41 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-09 09:29:27 +0200 |
| commit | f3a3a021c716b46ed35e6b7171bbff4d8042da68 (patch) | |
| tree | b7fdc1790761c3248d94be102a9eee71fa9077a9 /builtin/difftool.c | |
| parent | difftool: allow running outside Git worktrees with --no-index (diff) | |
| download | git-f3a3a021c716b46ed35e6b7171bbff4d8042da68.tar.xz git-f3a3a021c716b46ed35e6b7171bbff4d8042da68.zip | |
difftool --no-index: error out on --dir-diff (and don't crash)
In `--no-index` mode, we now no longer require a worktree nor a
repository. But some code paths in `difftool` expect those to be
present.
The most notable such code path is the `--dir-diff` one: we use the
existing checkout machinery to copy the files, and that machinery looks
up replacement refs, looks at alternate ODBs, wants to use the worktree
path, etc.
Rather than running into segmentation faults, let's die with an
informative error message.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/difftool.c')
| -rw-r--r-- | builtin/difftool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 4fff1e83f9..5704a76088 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -735,7 +735,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); |