Re: [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help

2014-10-11 Thread David Aguilar
On Fri, Oct 10, 2014 at 10:01:57AM +0100, Charles Bailey wrote: On 10 Oct 2014, at 09:51, David Aguilar dav...@gmail.com wrote: Changes since v1: NONGIT_OK=Yes was added to make it actually work outside of a git repo. Does this actually work? The reason that I haven't got around to

Re: [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help

2014-10-11 Thread Charles Bailey
On 11 Oct 2014, at 09:29, David Aguilar dav...@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

[PATCH v2 1/2] mergetool: don't require a work tree for --tool-help

2014-10-10 Thread David Aguilar
From: Charles Bailey cbaile...@bloomberg.net Signed-off-by: Charles Bailey cbaile...@bloomberg.net Signed-off-by: David Aguilar dav...@gmail.com --- Changes since v1: NONGIT_OK=Yes was added to make it actually work outside of a git repo. git-mergetool.sh | 4 +++- 1 file changed, 3

Re: [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help

2014-10-10 Thread Charles Bailey
On 10 Oct 2014, at 09:51, David Aguilar dav...@gmail.com wrote: Changes since v1: NONGIT_OK=Yes was added to make it actually work outside of a git repo. Does this actually work? The reason that I haven't got around to resending my re-roll is that I found that I needed changes to