summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-05-08 14:52:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-09 16:29:27 +0900
commitf3a3a021c716b46ed35e6b7171bbff4d8042da68 (patch)
treeb7fdc1790761c3248d94be102a9eee71fa9077a9 /builtin.h
parentdifftool: allow running outside Git worktrees with --no-index (diff)
downloadtgif-f3a3a021c716b46ed35e6b7171bbff4d8042da68.tar.xz
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.h')
0 files changed, 0 insertions, 0 deletions