diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-08 13:36:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-08 13:36:03 -0800 |
| commit | a83c2d2972b7821e45192df08142d27ebc51da48 (patch) | |
| tree | 06647fcd34262da86bee65a45477fecccd579f22 /contrib/examples/git-difftool.perl | |
| parent | e66adcadfe63508dfd7410c2253116043894d298 (diff) | |
| parent | 853e10c19755669bd4695b1d9fd81f3278466727 (diff) | |
| download | git-a83c2d2972b7821e45192df08142d27ebc51da48.tar.gz | |
Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup
* da/difftool-dir-diff-fix:
difftool: fix dir-diff index creation when in a subdirectory
Diffstat (limited to 'contrib/examples/git-difftool.perl')
| -rwxr-xr-x | contrib/examples/git-difftool.perl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/examples/git-difftool.perl b/contrib/examples/git-difftool.perl index a5790d03a0..959822d5f3 100755 --- a/contrib/examples/git-difftool.perl +++ b/contrib/examples/git-difftool.perl @@ -182,6 +182,10 @@ EOF } } + # Go to the root of the worktree so that the left index files + # are properly setup -- the index is toplevel-relative. + chdir($workdir); + # Setup temp directories my $tmpdir = tempdir('git-difftool.XXXXX', CLEANUP => 0, TMPDIR => 1); my $ldir = "$tmpdir/left"; |