difftool: fix argument handling in subdirs
authorJohn Keeping <john@keeping.me.uk>
Tue, 19 Jul 2016 03:57:54 +0000 (20:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2016 18:12:27 +0000 (11:12 -0700)
commit9ec26e797781239b36ebccb87c590e5778358007
tree224800e2ea977035c7161f34678b827ce4e135e4
parent05219a1276341e72d8082d76b7f5ed394b7437a4
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>
git-difftool.perl