| From: | Josh Berkus <josh(at)agliodbs(dot)com> |
|---|---|
| To: | Ashutosh Bapat <ashutosh(dot)bapat(at)enterprisedb(dot)com> |
| Cc: | Andres Freund <andres(at)2ndquadrant(dot)com>, Andrew Dunstan <andrew(at)dunslane(dot)net>, PG Hackers <pgsql-hackers(at)postgresql(dot)org> |
| Subject: | Re: git apply vs patch -p1 |
| Date: | 2013-09-16 19:06:57 |
| Message-ID: | 523756D1.7080303@agliodbs.com |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-hackers |
On 09/15/2013 11:46 PM, Ashutosh Bapat wrote:
> On Sun, Sep 15, 2013 at 12:38 AM, Andres Freund <andres(at)2ndquadrant(dot)com>wrote:
>> git reset?
>>
>>
> git reset wouldn't remove the files that were newly added by the patch,
> would it?
The issue isn't that, it's that git apply is just buggy and can't tell
the difference between a new file and a modified one.
The "points" patch contained no new files, just modifications. But for
some reason, git apply read it as being all new files, which failed.
"patch -p1" worked fine.
--
Josh Berkus
PostgreSQL Experts Inc.
http://pgexperts.com
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Andrew Gierth | 2013-09-16 19:11:29 | Re: git apply vs patch -p1 |
| Previous Message | Kevin Grittner | 2013-09-16 18:53:14 | Re: record identical operator |