git apply vs patch -p1

Поиск
Список
Период
Сортировка
От Josh Berkus
Тема git apply vs patch -p1
Дата
Msg-id 5234ACED.7070403@agliodbs.com
обсуждение исходный текст
Ответы Re: git apply vs patch -p1  (Andrew Dunstan <andrew@dunslane.net>)
Re: git apply vs patch -p1  (Peter Eisentraut <peter_e@gmx.net>)
Список 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 по дате отправления:

Предыдущее
От: Peter Eisentraut
Дата:
Сообщение: Re: pg_stat_statements: calls under-estimation propagation
Следующее
От: Marko Tiikkaja
Дата:
Сообщение: Assertions in PL/PgSQL