summaryrefslogtreecommitdiff
path: root/t/t1013
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2014-02-23 19:12:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-24 09:53:57 -0800
commit94eaa806519498de2ca59a424b013812d72d21c5 (patch)
tree3fba9ea8512b6023845f4a97aa5bba01a6d2e4e4 /t/t1013
parentGit 1.8.5.5 (diff)
downloadtgif-94eaa806519498de2ca59a424b013812d72d21c5.tar.xz
difftool: support repositories with .git-files
Modern versions of "git submodule" use .git-files to setup the submodule directory. When run in a "git submodule"-created repository "git difftool --dir-diff" dies with the following error: $ git difftool -d HEAD~ fatal: This operation must be run in a work tree diff --raw --no-abbrev -z HEAD~: command returned error: 128 core.worktree is relative to the .git directory but the logic in find_worktree() does not account for it. Use `git rev-parse --show-toplevel` to find the worktree so that the dir-diff feature works inside a submodule. Reported-by: Gábor Lipták <gabor.liptak@gmail.com> Helped-by: Jens Lehmann <jens.lehmann@web.de> Helped-by: John Keeping <john@keeping.me.uk> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1013')
0 files changed, 0 insertions, 0 deletions