From: David Aguilar <davvid@gmail.com>
To: "Frédéric Heitzmann" <frederic.heitzmann@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: git difftool does does not respect current working directory
Date: Sat, 21 May 2011 23:14:48 -0700 [thread overview]
Message-ID: <20110522061446.GA49297@gmail.com> (raw)
In-Reply-To: <4DD7874A.2050604@gmail.com>
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
next prev parent reply other threads:[~2011-05-22 6:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-14 14:25 git difftool does does not respect current working directory Frédéric Heitzmann
2011-05-16 5:39 ` Junio C Hamano
2011-05-20 3:59 ` David Aguilar
2011-05-20 4:10 ` David Aguilar
2011-05-20 4:31 ` Junio C Hamano
2011-05-20 4:48 ` David Aguilar
2011-05-21 9:35 ` Frédéric Heitzmann
2011-05-22 6:14 ` David Aguilar [this message]
2011-05-22 6:30 ` Junio C Hamano
2011-05-22 6:50 ` David Aguilar
2011-05-22 9:57 ` [PATCH 1/3] setup: Provide GIT_PREFIX to built-ins David Aguilar
2011-05-22 9:57 ` [PATCH 2/3] git: Remove handling for GIT_PREFIX David Aguilar
2011-05-22 9:57 ` [PATCH 3/3] git-mergetool--lib: Make vimdiff retain the current directory David Aguilar
2011-05-23 6:36 ` Michael J Gruber
2011-05-23 19:59 ` Junio C Hamano
2011-05-23 12:09 ` [PATCH 1/3] setup: Provide GIT_PREFIX to built-ins Ævar Arnfjörð Bjarmason
2011-05-25 4:19 ` David Aguilar
[not found] ` <1306058055-93672-1-git-send-email-davvid@gmail.com>
[not found] ` <4DDA0044.2060207@drmicha.warpmail.net>
2011-05-23 8:40 ` David Aguilar
2011-05-23 9:58 ` Michael J Gruber
2011-05-23 16:43 ` Junio C Hamano
2011-05-24 7:23 ` Michael J Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110522061446.GA49297@gmail.com \
--to=davvid@gmail.com \
--cc=frederic.heitzmann@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.