From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git ML <git@vger.kernel.org>
Subject: Re: [PATCH 2/3] difftool: chdir as early as possible
Date: Fri, 9 Dec 2016 16:03:59 -0800 [thread overview]
Message-ID: <20161210000359.4uypoxg67zlsthc7@gmail.com> (raw)
In-Reply-To: <xmqqbmwkr9ji.fsf@gitster.mtv.corp.google.com>
On Fri, Dec 09, 2016 at 03:02:09PM -0800, Junio C Hamano wrote:
> David Aguilar <davvid@gmail.com> writes:
>
> > @@ -182,10 +188,6 @@ EOF
> > }
> > }
> >
> > - # Go to the root of the worktree so that the left index files
> > - # are properly setup -- the index is toplevel-relative.
> > - chdir($workdir);
> > -
> > # Setup temp directories
> > my $tmpdir = tempdir('git-difftool.XXXXX', CLEANUP => 0, TMPDIR => 1);
> > my $ldir = "$tmpdir/left";
>
> What codebase are you basing your work on? I do not see these
> removed four lines in my tree, so it seems that the patch is fixing
> up some other fix I do not yet have.
Sorry about that.
I forgot to mention that this is based on the patches I recently
sent, which were in the "pu" branch. The whats-cooking report
mentioned that they'll be merged to "next", so they might be
there already too.
The patch this was based upon:
difftool: fix dir-diff index creation when in a subdirectory
--
David
next prev parent reply other threads:[~2016-12-10 0:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-09 8:58 [PATCH 1/3] difftool: sanitize $workdir as early as possible David Aguilar
2016-12-09 8:58 ` [PATCH 2/3] difftool: chdir " David Aguilar
2016-12-09 23:02 ` Junio C Hamano
2016-12-10 0:03 ` David Aguilar [this message]
2016-12-09 8:58 ` [PATCH 3/3] difftool: rename variables for consistency David Aguilar
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=20161210000359.4uypoxg67zlsthc7@gmail.com \
--to=davvid@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).