Re: git apply vs patch -p1

Поиск
Список
Период
Сортировка
От Andrew Gierth
Тема Re: git apply vs patch -p1
Дата
Msg-id 87k3ig5vhh.fsf@news-spur.riddles.org.uk
обсуждение исходный текст
Ответ на Re: git apply vs patch -p1  (Jeff Janes <jeff.janes@gmail.com>)
Список pgsql-hackers
>>>>> "Jeff" == Jeff Janes <jeff.janes@gmail.com> writes:
Jeff> I used "git diff" configured to useJeff> src/tools/git-external-diff, as described here:

hmm...

so that git-external-diff script is trying to fake git diff output,
including using 'diff -git' and index lines, but the context-diff
output wouldn't work with git apply even if the header lines were
correct (as far as I can see git apply accepts only git's unified-diff
format - the git people clearly have no truck with context diffs).

-- 
Andrew (irc:RhodiumToad)



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

Предыдущее
От: Andres Freund
Дата:
Сообщение: Re: record identical operator
Следующее
От: Antonin Houska
Дата:
Сообщение: Dead function argument?