Re: git difftool does does not respect current working directory

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, May 21, 2011 at 11:35:06AM +0200, FrÃdÃric Heitzmann wrote:
> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]