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

Re: Fixing the p4merge launch shell script

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 3, 2012, 00:44 UTC
Message-ID
<7vipas5qpu.fsf@alter.siamese.dyndns.org>
In-Reply-To
<506B7AFB.1070700@game-point.net>
Jeremy Morton <admin@game-point.net> writes:
Show 8 quoted lines
> I've noticed that the p4merge shell script could do with some
> improvement when it comes to merging.  Because p4merge throws up an
> error when one of the files it's given to diff is "/dev/null", git
> needs to create a temporary empty file and pass that to p4merge when
> diffing a file that has been created/deleted (eg. create file, git add
> ., git diff --cached).
> ...
> Thoughts?  Is there an easier way to do this?

Which version of git? Perhaps you do not have ec245ba (mergetool: Provide an empty file when needed, 2012-01-19) yet?

Previous: Jeremy MortonNext: Jeremy Morton
Message 2 of 4 in “Fixing the p4merge launch shell script”
  1. Jeremy MortonOct 2, 2012
  2. Junio C HamanoOct 3, 2012
  3. Jeremy MortonOct 3, 2012
  4. David AguilarOct 4, 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.