git/list[1] front-page[2] threads[3] people[4] search[5] about
 

difftool -d not populating left correctly when not in git root

From
FBFrank Becker <fb@mooflu.com>
Date
Dec 2, 2016, 23:04 UTC
Message-ID
<68f49f5e-4e71-fd52-cd6f-64e92face962@mooflu.com>
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.

Next: David Aguilar
Message 1 of 3 in “difftool -d not populating left correctly when not in git root”
  1. Frank BeckerDec 2, 2016
  2. David AguilarDec 4, 2016
  3. Johannes SchindelinDec 5, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.