From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 23:11:08 +0000 (-0800)
Subject: Merge branch 'jk/difftool-in-subdir' into maint
X-Git-Tag: v2.11.1~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a558332f5eda1f9d4cb4abe0e68062c625e5049f;p=thirdparty%2Fgit.git

Merge branch 'jk/difftool-in-subdir' into maint

Even though an fix was attempted in Git 2.9.3 days, but running
"git difftool --dir-diff" from a subdirectory never worked. This
has been fixed.

* jk/difftool-in-subdir:
  difftool: rename variables for consistency
  difftool: chdir as early as possible
  difftool: sanitize $workdir as early as possible
  difftool: fix dir-diff index creation when in a subdirectory
---

a558332f5eda1f9d4cb4abe0e68062c625e5049f
diff --cc git-difftool.perl
index 959822d5f3,4e4f5d8138..e26294feab
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@@ -182,10 -188,6 +188,10 @@@ EO
  		}
  	}
  
 +	# Go to the root of the worktree so that the left index files
 +	# are properly setup -- the index is toplevel-relative.
- 	chdir($workdir);
++	chdir($worktree);
 +
  	# Setup temp directories
  	my $tmpdir = tempdir('git-difftool.XXXXX', CLEANUP => 0, TMPDIR => 1);
  	my $ldir = "$tmpdir/left";