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 10, 2014, 09:01 UTC
Message-ID
<FCAAE5E4-E220-4B45-A6A1-B2AFB79F9069@hashpling.org>
In-Reply-To
<1412931104-74648-1-git-send-email-davvid@gmail.com>
On 10 Oct 2014, at 09:51, David Aguilar <davvid@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 git-sh-setup.sh because doing NONGIT_OK and then require_work_tree didn't correctly set GIT_DIR when it wasn't already explicitly set in the environment. (I believe the rest of mergetool relies on it.)
Perhaps I misunderstood, though.
Previous: David AguilarNext: David Aguilar
Message 3 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.