From: Charles Bailey <charles@hashpling.org>
Date: Sat, 11 Oct 2014 08:35:51 GMT
Subject: Re: [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help
Message-ID: <3D01E1E7-627C-427F-9E99-4B2271447B0D@hashpling.org>
In-Reply-To: <20141011082954.GA79450@gmail.com>




> On 11 Oct 2014, at 09:29, David Aguilar <davvid@gmail.com> wrote:
> 
> Thanks for the heads-up.
> 
> I tested mergetool and it seems fine but indeed there's an
> `if test -e "$GIT_DIR/MERGE_RR"` in there that is surely not
> working as intended.
> 
> One solution would be to move the work done in the test -z "$NONGIT_OK"
> block in git-sh-setup into a function e.g. git_dir_init () so
> that we can defer the GIT_DIR initialization until after
> require_work_tree has been called.

I believe I had a very similar idea but the vast number of things that would potentially be affected by changing git-sh-setup.sh made me put things on hold in case I had any other ideas.

I haven't so I think this is probably the best approach.