| From: | Andrew Gierth <andrew(at)tao11(dot)riddles(dot)org(dot)uk> |
|---|---|
| To: | Jeff Janes <jeff(dot)janes(at)gmail(dot)com> |
| Cc: | Josh Berkus <josh(at)agliodbs(dot)com>, Ashutosh Bapat <ashutosh(dot)bapat(at)enterprisedb(dot)com>, Andres Freund <andres(at)2ndquadrant(dot)com>, PG Hackers <pgsql-hackers(at)postgresql(dot)org> |
| Subject: | Re: git apply vs patch -p1 |
| Date: | 2013-09-16 21:10:16 |
| Message-ID: | 87k3ig5vhh.fsf@news-spur.riddles.org.uk |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-hackers |
>>>>> "Jeff" == Jeff Janes <jeff(dot)janes(at)gmail(dot)com> writes:
Jeff> I used "git diff" configured to use
Jeff> 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)
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Antonin Houska | 2013-09-16 21:21:24 | Dead function argument? |
| Previous Message | Andres Freund | 2013-09-16 21:04:14 | Re: record identical operator |