On Fri, Dec 09, 2016 at 03:02:09PM -0800, Junio C Hamano wrote:
> David Aguilar <davvid@xxxxxxxxx> 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