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

Re: git difftool does does not respect current working directory

From
David Aguilar <davvid@gmail.com>
Date
May 22, 2011, 06:14 UTC
Message-ID
<20110522061446.GA49297@gmail.com>
In-Reply-To
<4DD7874A.2050604@gmail.com>
On Sat, May 21, 2011 at 11:35:06AM +0200, Frédéric Heitzmann wrote:
Show 13 quoted lines
> Reading your replies, my understanding is :
> - difftool is consistent with diff, and chdir to root directory. It
> is seems indeed very common to have diffs showing from the root
> directory.
> - on the overhand, openning gvimdiff via difftool and having a new
> cwd is for sure not consistent with usual gvim text editing.
> 
> I am afraid I am going to need some gvim trick like :
> $ git difftool -x "gvimdiff -f -d -c 'wincmd l' -c 'cd $PWD' " my_file
> 
> Not sure that it is less messy though ;-)
> If there is no stronger need to adapt git-difftool, for gvimdiff or
> any other difftool, we could probably settle for it.

I think updating git-difftool--helper.sh to pass a chdir to vim might be just the thing to do. git-difftool.perl can be updated to set $GIT_DIFFTOOL_PWD so that the helper can use it as -c 'cd $GIT_DIFFTOOL_PWD'. I'll see if I can whip up a patch in a lil bit.

-- 
					David
Previous: Frédéric HeitzmannNext: Junio C Hamano
Message 8 of 21 in “git difftool does does not respect current working directory”
  1. Frédéric HeitzmannMay 14, 2011
  2. Junio C HamanoMay 16, 2011
  3. David AguilarMay 20, 2011
  4. David AguilarMay 20, 2011
  5. Junio C HamanoMay 20, 2011
  6. David AguilarMay 20, 2011
  7. Frédéric HeitzmannMay 21, 2011
  8. David AguilarMay 22, 2011
  9. Junio C HamanoMay 22, 2011
  10. David AguilarMay 22, 2011
  11. 1/3 setup: Provide GIT_PREFIX to built-insDavid Aguilar, May 22, 2011
  12. 2/3 git: Remove handling for GIT_PREFIXDavid Aguilar, May 22, 2011
  13. 3/3 git-mergetool--lib: Make vimdiff retain the current directoryDavid Aguilar, May 22, 2011
  14. Michael J GruberMay 23, 2011
  15. Junio C HamanoMay 23, 2011
  16. Ævar Arnfjörð BjarmasonMay 23, 2011
  17. David AguilarMay 25, 2011
  18. David AguilarMay 23, 2011
  19. Michael J GruberMay 23, 2011
  20. Junio C HamanoMay 23, 2011
  21. Michael J GruberMay 24, 2011

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.