From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: David Aguilar <davvid@gmail.com>
Cc: Frank Becker <fb@mooflu.com>,
git@vger.kernel.org, John Keeping <john@keeping.me.uk>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: difftool -d not populating left correctly when not in git root
Date: Mon, 5 Dec 2016 12:46:14 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1612051222560.117539@virtualbox> (raw)
In-Reply-To: <20161204223139.kk2ejrfc5elxmsro@gmail.com>
Hi David,
On Sun, 4 Dec 2016, David Aguilar wrote:
> Date: Sun, 4 Dec 2016 14:27:17 -0800
> Subject: [PATCH] difftool: properly handle being launched from a subdirectory
>
> 9ec26e797781239b36ebccb87c590e5778358007 corrected how path arguments
> are handled in a subdirectory, but it introduced a regression in how
> entries outside of the subdirectory are handled by the dir-diff.
>
> When preparing the right-side of the diff we only construct the parts
> that changed.
>
> When constructing the left side we construct an index, but we were
> constructing it relative to the subdirectory, and thus it ends up empty
> because we are in a subdirectory and the paths are incorrect.
>
> Teach difftool to chdir to the toplevel of the repository before
> preparing its temporary indexes. This ensures that all of the
> toplevel-relative paths are valid.
>
> Add a test case to exercise this use case.
>
> Reported-by: Frank Becker <fb@mooflu.com>
> Signed-off-by: David Aguilar <davvid@gmail.com>
I applied this to my builtin-difftool branch (which, as per Peff's
suggestion, runs t7800 both with and without the builtin difftool) and the
tests pass:
https://github.com/dscho/git/commit/9b9a69c5ee975a4a2565343ae0a9199a6ac89609
Which means that the builtin difftool already had fixed the bug, more by
coincidence than by design, I have to admit.
Ciao,
Johannes
prev parent reply other threads:[~2016-12-05 11:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 23:04 difftool -d not populating left correctly when not in git root Frank Becker
2016-12-04 22:31 ` David Aguilar
2016-12-05 11:46 ` Johannes Schindelin [this message]
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=alpine.DEB.2.20.1612051222560.117539@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=fb@mooflu.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox