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

From Josh Berkus
Subject git apply vs patch -p1
Date
Msg-id 5234ACED.7070403@agliodbs.com
Whole thread Raw
Responses Re: git apply vs patch -p1
Re: git apply vs patch -p1
List pgsql-hackers
Folks,

Lately I've been running into a lot of reports of false conflicts
reported by "git apply".  The most recent one was the "points" patch,
which git apply rejected for completely ficticious reasons (it claimed
that the patch was trying to create a new file where a file already
existed, which it wasn't).

I think we should modify the patch review and developer instructions to
recommend always using patch -p1 (or -p0, depending), even if the patch
was produced with "git diff".

Thoughts?

-- 
Josh Berkus
PostgreSQL Experts Inc.
http://pgexperts.com



pgsql-hackers by date:

Previous
From: Peter Eisentraut
Date:
Subject: Re: pg_stat_statements: calls under-estimation propagation
Next
From: Marko Tiikkaja
Date:
Subject: Assertions in PL/PgSQL