Re: [PATCH v2] mergetools: add support for DeltaWalker

From: Tim Henigan <tim.henigan@gmail.com>
Date: Mar 5, 2012, 14:22 UTC
Message-ID: <CAFouetgZOgsiA_85N+=CfC5wXOg8PWFJxfw6U0grgs9SYEFsAA@mail.gmail.com>
In-Reply-To: <CAJDDKr6toChs8KpnAbjxeemBZT1AT1Uk9Ajk7DWBREuM6yFMzg@mail.gmail.com>

On Sun, Mar 4, 2012 at 9:10 PM, David Aguilar <davvid@gmail.com> wrote:

> Thanks, that makes a lot of sense.  It looks like they have a bug.  Do
> they know about it?

I have not reported the problem to them yet.

> Can you mention this in a comment so that someone doesn't copy/paste
> it into another tool in the future?

Will add a comment in v4.

> If they fix it then we may want to consider only supporting the newer
> version and remove the $PWD.  Does the OS X version have this bug too?

I don't have a OS X environment to test on. However, I did just find out that the bug is not present on Ubuntu 11.10. On Ubuntu, it works with or without $(pwd)/. The two platforms have different Java JDKs, so that could be a factor.

Show 9 quoted lines

> I didn't notice any other production shell scripts in git using $PWD.
> There is one use of `pwd` in git-stash.sh and it's used in a few
> tests, as is $PWD, but $(pwd) is the most prevalent overall.  I don't
> know the reason $PWD is avoided in the git shell scripts (though
> portability is often the reason).
>
> Deltawalker is not currently available on any of the platforms where
> this would be a concern, but we may still want to use $(pwd) for
> consistency with the other commands.  Does that work instead?

$(pwd) works...I will make this change in v4.