git apply vs patch -p1

From: Josh Berkus <josh(at)agliodbs(dot)com>
To: PG Hackers <pgsql-hackers(at)postgresql(dot)org>
Subject: git apply vs patch -p1
Date: 2013-09-14 18:37:33
Message-ID: 5234ACED.7070403@agliodbs.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: 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

Responses

Browse pgsql-hackers by date

  From Date Subject
Next Message Marko Tiikkaja 2013-09-14 18:47:27 Assertions in PL/PgSQL
Previous Message Peter Eisentraut 2013-09-14 18:37:29 Re: pg_stat_statements: calls under-estimation propagation