svn commit: r320579 - head/usr.bin/patch

Pedro Giffuni pfg at FreeBSD.org
Mon Jul 3 19:25:28 UTC 2017



On 7/3/2017 2:14 PM, Alexey Dokuchaev wrote:
> On Mon, Jul 03, 2017 at 01:35:25PM -0500, Pedro Giffuni wrote:
>> On 7/3/2017 1:17 PM, Alexey Dokuchaev wrote:
>>> On Mon, Jul 03, 2017 at 10:42:15AM -0500, Pedro Giffuni wrote:
>>>> On 07/02/17 21:53, Conrad Meyer wrote:
>>>>> Does this change the behavior of 'patch -p1' (for example) with 'git
>>>>> diff' generated diffs?  So patches that could be applied with -p1
>>>>> before now need to be applied with -p0?  Or is this a different mode
>>>>> of patch?
>>>> IMHO, the (new) BSD patch behavior is somewhat more natural in the sense
>>>> that no one asked git to add a prefix to the path so it makes sense to
>>>> ignore it.
>>> But -p1 already solves the problem; why add any ad-hoc handling to some
>>> particular program that tends to generate patches whatever the way it
>>> does?
>> The behavior only applies to git diffs.
> But -p1 already solves the problem in a generic way.  What good is to add
> specific code to make it git-or-next-cool-kid-on-the-block-aware?

Yes, it's good: it saves me time while merging github patches from 
OpenBSD and NetBSD.
Feel free to keep using -p1.

Pedro.



More information about the svn-src-head mailing list