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

Re: [PATCH v2 10/14] difftool: add various git-difftool tests

From
David Aguilar <davvid@gmail.com>
Date
Apr 7, 2009, 22:38 UTC
Message-ID
<20090407223834.GA71200@gmail.com>
In-Reply-To
<200904071952.21109.markus.heidelberg@web.de>
On  0, Markus Heidelberg <markus.heidelberg@web.de> wrote:
Show 14 quoted lines
> David Aguilar, 07.04.2009:
> > t7800-difftool.sh tests the various command-line flags,
> > git-config variables, and environment settings supported by
> > git-difftool.
> > 
> > Signed-off-by: David Aguilar <davvid@gmail.com>
> > ---
> > 
> > The original broke the test suite on Mac OS.
> > Testing difftool.<path>.path is hard without internal support
> > for a fake tool.
> 
> Mac OS doesn't have the "echo" command?
>

Hmmm maybe the thing that validates the merge tool isn't using the $merge_tool_path when validating. All I know is that it was failing so figured I could add it again later.

-- 
		David
Previous: Markus HeidelbergNext: David Aguilar
Message 9 of 10 in “Updates to the latest {diff,merge}tool series”
  1. David AguilarApr 7, 2009
  2. 07/14 difftool: add a -y shortcut for --no-promptDavid Aguilar, Apr 7, 2009
  3. 09/14 difftool: move 'git-difftool' out of contribDavid Aguilar, Apr 7, 2009
  4. 10/14 difftool: add various git-difftool testsDavid Aguilar, Apr 7, 2009
  5. 11/14 difftool: add support for a difftool.prompt config variableDavid Aguilar, Apr 7, 2009
  6. 14/14 difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar, Apr 7, 2009
  7. Markus HeidelbergApr 7, 2009
  8. Markus HeidelbergApr 7, 2009
  9. David AguilarApr 7, 2009
  10. David AguilarApr 7, 2009

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.