Re: git apply vs patch -p1

Поиск
Список
Период
Сортировка
От Josh Berkus
Тема Re: git apply vs patch -p1
Дата
Msg-id 523756D1.7080303@agliodbs.com
обсуждение исходный текст
Ответ на git apply vs patch -p1  (Josh Berkus <josh@agliodbs.com>)
Ответы Re: git apply vs patch -p1  (Andrew Gierth <andrew@tao11.riddles.org.uk>)
Список pgsql-hackers
On 09/15/2013 11:46 PM, Ashutosh Bapat wrote:
> On Sun, Sep 15, 2013 at 12:38 AM, Andres Freund <andres@2ndquadrant.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



В списке pgsql-hackers по дате отправления:

Предыдущее
От: Kevin Grittner
Дата:
Сообщение: Re: record identical operator
Следующее
От: Andrew Gierth
Дата:
Сообщение: Re: git apply vs patch -p1