diff options
| author |  John Keeping <john@keeping.me.uk> | 2016-07-18 20:57:54 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-07-19 11:12:27 -0700 |
| commit | 9ec26e797781239b36ebccb87c590e5778358007 (patch) | |
| tree | 224800e2ea977035c7161f34678b827ce4e135e4 /mergetools | |
| parent | Git 2.9 (diff) | |
| download | tgif-9ec26e797781239b36ebccb87c590e5778358007.tar.xz | |
difftool: fix argument handling in subdirs
When in a subdirectory of a repository, path arguments should be
interpreted relative to the current directory not the root of the
working tree.
The Git::repository object passed into setup_dir_diff() is configured to
handle this correctly but we create a new Git::repository here without
setting the WorkingSubdir argument. By simply using the existing
repository, path arguments are handled relative to the current
directory.
Reported-by: Bernhard Kirchen <bernhard.kirchen@rwth-aachen.de>
Signed-off-by: John Keeping <john@keeping.me.uk>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions