All of lore.kernel.org
 help / color / mirror / Atom feed
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: Thu, 19 May 2011 21:10:46 -0700	[thread overview]
Message-ID: <20110520041045.GB13582@gmail.com> (raw)
In-Reply-To: <20110520035856.GA13582@gmail.com>

On Thu, May 19, 2011 at 08:59:00PM -0700, David Aguilar wrote:
> 
> Hello,
> 
> On Sun, May 15, 2011 at 10:39:18PM -0700, Junio C Hamano wrote:
> > Frédéric Heitzmann  <frederic.heitzmann@gmail.com> writes:
> > 
> > > Unfortunately, 'git difftool' does not keep the current working directory while
> > > launching gvimdiff.
> > >
> > > => Is it done on purpose ?
> > > If not, it is probably a good idea to fix this.
> > 
> > [...snip...]
> > 
> > If the answers to both of them are No, then it might be a good idea to
> > change the behaviour.
> 
> Another thing to consider is ensuring that there is a
> consistency between 'diff' and 'difftool'.
> 
> When you run 'git diff' from a subdirectory git will show you
> a diff against the entire tree.  In this respect, 'difftool' is
> consistent.  In that sense, yes, this is very much "on purpose".
> 
> [...snip...]

I just realized that I was focusing on the "whole tree diff"
aspect which really is orthogonal to the "chdir to root"
done by 'git diff' when running $GIT_EXTERNAL_DIFF scripts.

I imagine you want to be able to use vimdiff while diffing
and open files, etc., from the current directory?

In that case, maybe we can have the best of both worlds --
whole-tree diff and keeping the current directory.
That would be kinda like what 'git status' does when it shows
you relative paths above and beside the current directory.

We would have to change the way $GIT_EXTERNAL_DIFF works so
that it preserves the current directory and constructs
paths relative to it.  Patches welcome :-)

I don't really know whether it would be a good thing to do,
though, since I have not dug too deep into how the extdiff
code is structured.
-- 
					David

  reply	other threads:[~2011-05-20  4:10 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 [this message]
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
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=20110520041045.GB13582@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.