summaryrefslogtreecommitdiff
path: root/hex.c
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <tr@thomasrast.ch>2014-02-16 17:52:34 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-18 12:06:08 -0800
commitaba4727281612c3e24914691727e11e1f44a9aac (patch)
tree046c974c9f70052cd9b29a7e18b2310eede101f6 /hex.c
parentGit 1.8.4.5 (diff)
downloadtgif-aba4727281612c3e24914691727e11e1f44a9aac.tar.xz
diff: do not reuse_worktree_file for submodules
The GIT_EXTERNAL_DIFF calling code attempts to reuse existing worktree files for the worktree side of diffs, for performance reasons. However, that code also tries to do the same with submodules. This results in calls to $GIT_EXTERNAL_DIFF where the old-file is a file of the form "Submodule commit $sha1", but the new-file is a directory in the worktree. Fix it by never reusing a worktree "file" in the submodule case. Reported-by: Grégory Pakosz <gregory.pakosz@gmail.com> Signed-off-by: Thomas Rast <tr@thomasrast.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'hex.c')
0 files changed, 0 insertions, 0 deletions