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

Re: difftool / mergetool waiting

From
David Aguilar <davvid@gmail.com>
Date
Jan 20, 2012, 07:25 UTC
Message-ID
<CAJDDKr4WWfui5micnDQ97fJQC_5UxXoAB062vhHEPBVa070Bvw@mail.gmail.com>
In-Reply-To
<m239biadb5.fsf@igel.home>
On Sat, Jan 14, 2012 at 12:38 AM, Andreas Schwab <schwab@linux-m68k.org> wrote:
Show 7 quoted lines
> Jonathan Seng <nekenyu@gmail.com> writes:
>
>> If wait is false, git would fire off the tool command and proceed to
>> the next then exit cleanly.
>
> That doesn't work for git mergetool, it wouldn't be able to postprocess
> the result of calling the tool command.

The difficulty on the difftool side is that the git-difftool--helper scriptlet is being driven by git diff (as a $GIT_EXTERNAL_DIFF) and depends on git diff to do the temp file cleanup. Not blocking would return control immediately to git diff. This is unwanted because the temp files would likely be removed before the tools have a chance to open them.

You could write a script that simply forks off multiple difftool commands. The difftool stuff in git-cola does exactly that, for example.

-- 
            David
Previous: Andreas Schwab
Message 3 of 3 in “difftool / mergetool waiting”
  1. Jonathan SengJan 14, 2012
  2. Andreas SchwabJan 14, 2012
  3. David AguilarJan 20, 2012

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.