git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Charles Bailey <charles@hashpling.org>
Date
Oct 11, 2014, 08:35 UTC
Message-ID
<3D01E1E7-627C-427F-9E99-4B2271447B0D@hashpling.org>
In-Reply-To
<20141011082954.GA79450@gmail.com>
Show 12 quoted lines
> 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.
Previous: David Aguilar
Message 5 of 5 in “mergetool: don't require a work tree for --tool-help”
  1. 1/2 mergetool: don't require a work tree for --tool-helpDavid Aguilar, Oct 10, 2014
  2. 2/2 difftool: don't assume that default sh is saneDavid Aguilar, Oct 10, 2014
  3. Charles BaileyOct 10, 2014
  4. David AguilarOct 11, 2014
  5. Charles BaileyOct 11, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.