diff options
| author |  David Aguilar <davvid@gmail.com> | 2014-02-23 19:12:35 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-02-24 09:53:57 -0800 |
| commit | 94eaa806519498de2ca59a424b013812d72d21c5 (patch) | |
| tree | 3fba9ea8512b6023845f4a97aa5bba01a6d2e4e4 /diffcore-break.c | |
| parent | Git 1.8.5.5 (diff) | |
| download | tgif-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 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions