Hi,
looks like this broke between 2.9.2 and 2.9.3
cat ~/.gitconfig
[difftool "diff"]
cmd = ls -l ${LOCAL}/* ${REMOTE}/*
#cmd = diff -r ${LOCAL} ${REMOTE} | less
~/stuff/gittest> ls -l *
d1:
total 8
-rw-r--r-- 1 frank staff 16 2 Dec 14:30 test.txt
d2:
total 8
-rw-r--r-- 1 frank staff 18 2 Dec 14:30 anothertest.tst
~/stuff/gittest> git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: d1/test.txt
modified: d2/anothertest.tst
~/stuff/gittest> ~/stuff/git_tmp/bin/git --version
git version 2.11.0
~/stuff/gittest> ~/stuff/git_tmp/bin/git difftool -d -t diff
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.0oGRF/left/d1:
total 8
-rw-r--r-- 1 frank staff 6 2 Dec 14:52 test.txt
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.0oGRF/left/d2:
total 8
-rw-r--r-- 1 frank staff 7 2 Dec 14:52 anothertest.tst
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.0oGRF/right/d1:
total 8
lrwxr-xr-x 1 frank staff 38 2 Dec 14:52 test.txt ->
/Users/frank/stuff/gittest/d1/test.txt
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.0oGRF/right/d2:
total 8
lrwxr-xr-x 1 frank staff 45 2 Dec 14:52 anothertest.tst ->
/Users/frank/stuff/gittest/d2/anothertest.tst
cd d2
~/stuff/gittest/d2> ~/stuff/git_tmp/bin/git difftool -d -t diff
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.eRXhB/left/d2:
total 8
-rw-r--r-- 1 frank staff 7 2 Dec 14:52 anothertest.tst
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.eRXhB/right/d1:
total 8
lrwxr-xr-x 1 frank staff 38 2 Dec 14:52 test.txt ->
/Users/frank/stuff/gittest/d1/test.txt
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.eRXhB/right/d2:
total 8
lrwxr-xr-x 1 frank staff 45 2 Dec 14:52 anothertest.tst ->
/Users/frank/stuff/gittest/d2/anothertest.tst
Note that left does not contain d1
~/stuff/gittest/d2> ~/stuff/git_tmp/bin/git --version
git version 2.9.2
~/stuff/gittest/d2> ~/stuff/git_tmp/bin/git difftool -d -t diff
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.YxtVw/left/d1:
total 8
-rw-r--r-- 1 frank staff 6 2 Dec 15:02 test.txt
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.YxtVw/left/d2:
total 8
-rw-r--r-- 1 frank staff 7 2 Dec 15:02 anothertest.tst
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.YxtVw/right/d1:
total 8
lrwxr-xr-x 1 frank staff 38 2 Dec 15:02 test.txt ->
/Users/frank/stuff/gittest/d1/test.txt
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.YxtVw/right/d2:
total 8
lrwxr-xr-x 1 frank staff 45 2 Dec 15:02 anothertest.tst ->
/Users/frank/stuff/gittest/d2/anothertest.tst
~/stuff/gittest/d2> ~/stuff/git_tmp/bin/git --version
git version 2.9.3
~/stuff/gittest/d2> ~/stuff/git_tmp/bin/git difftool -d -t diff
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.TpJ5u/left/d2:
total 8
-rw-r--r-- 1 frank staff 7 2 Dec 15:01 anothertest.tst
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.TpJ5u/right/d1:
total 8
lrwxr-xr-x 1 frank staff 38 2 Dec 15:01 test.txt ->
/Users/frank/stuff/gittest/d1/test.txt
/var/folders/0j/3pk3pdsx7rzb9_njdpyjwm000000gn/T/git-difftool.TpJ5u/right/d2:
total 8
lrwxr-xr-x 1 frank staff 45 2 Dec 15:01 anothertest.tst ->
/Users/frank/stuff/gittest/d2/anothertest.tst
Cheers,
Frank.