Re: git apply vs patch -p1 - Mailing list pgsql-hackers

From Andrew Gierth
Subject Re: git apply vs patch -p1
Date
Msg-id 87k3ig5vhh.fsf@news-spur.riddles.org.uk
Whole thread Raw
In response to Re: git apply vs patch -p1  (Jeff Janes <jeff.janes@gmail.com>)
List pgsql-hackers
>>>>> "Jeff" == Jeff Janes <jeff.janes@gmail.com> writes:
Jeff> I used "git diff" configured to useJeff> src/tools/git-external-diff, as described here:

hmm...

so that git-external-diff script is trying to fake git diff output,
including using 'diff -git' and index lines, but the context-diff
output wouldn't work with git apply even if the header lines were
correct (as far as I can see git apply accepts only git's unified-diff
format - the git people clearly have no truck with context diffs).

-- 
Andrew (irc:RhodiumToad)



pgsql-hackers by date:

Previous
From: Andres Freund
Date:
Subject: Re: record identical operator
Next
From: Antonin Houska
Date:
Subject: Dead function argument?