From owner-svn-src-head@freebsd.org Mon Jul 3 19:25:28 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8CAEF9EE0BE for ; Mon, 3 Jul 2017 19:25:28 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm24-vm4.bullet.mail.ne1.yahoo.com (nm24-vm4.bullet.mail.ne1.yahoo.com [98.138.91.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 552537DEEE for ; Mon, 3 Jul 2017 19:25:28 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1499109818; bh=+RcEqIkJXUvUC+RfvaFyah4QEKXjLjFJaXi0SyvOHqo=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From:Subject; b=Dy4No3v3zrm8/HuSQpGvhUpTMK4lRLPUbEVVq7YITP8gU2wrZIb17ZiLyYp/NX6ry33LJt86/mtUx0H4pf9UlId+MbFhVZ9KBJfeTUjRo9JK+LH0cZzPmZ5gcKwOiLsRTuDoXrBcNHlOYtRo/MfN1mGjdG8uJIcmRJBzVYYDPXAN6lB38hT0woAoEBi9A8MPoEjzq+L86YxzSYuQsFXiS6XbTC6nhWJCpNlgokAUUs0NYYck3kPVL3jaWFvYSJCgc2tVfmX1vEsHs2jIvqWBWyLrPn1BBQLiblV0zbi4sqrz1rA9R5dz7NSCbE4dQaVawDEv7Vj9ZT6IYRlIEZe21A== Received: from [98.138.100.118] by nm24.bullet.mail.ne1.yahoo.com with NNFMP; 03 Jul 2017 19:23:38 -0000 Received: from [98.138.84.45] by tm109.bullet.mail.ne1.yahoo.com with NNFMP; 03 Jul 2017 19:23:38 -0000 Received: from [127.0.0.1] by smtp113.mail.ne1.yahoo.com with NNFMP; 03 Jul 2017 19:23:38 -0000 X-Yahoo-Newman-Id: 138853.74875.bm@smtp113.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 92yFD3sVM1lwpLiimPKmv0eLTjrhPs8rlkjgTSoiVhQxJXc fR9T1LES3RTVXlDCdNrlgIhoqwIQvSCG9thRYOmqEMysMqHTwtzVp1.vTBL7 FNEpjcVLKaEYIcJtdje12S9XQxl_4mY3X2NQrFu4B9foVBXOy4qEcHPzAbIr M3twxQFs9OOwa3VJyX0_70v4s_tnNvuvbBc0l7Z320gOPF1KK0vl4K2hmjv5 qtcdzDhgiymjfd2PLMsm22mJwB29o0rjoW4JT2LPJizmlx_vB77dRx2lWjmw QsvYv02dqYisX_v2BssPat0mLunKgyzGOi_azgUj3iEnXliryoQD9LMN65VS q0MaZXQi2ML_jlOSfTYMZlfcnLSuBnuLG09zmEboJR4ij0HYQGOsFtBym3HU NIt1PHlCwXmNDhJ2MUeYGEdQrMaYLrYy9HzvF_qgT4zIZQOaDuKcN2omrP9U aYsBn9vCJWwVxQizGLoiDnxCaCDKmQlVQJPqAdx2DyYDt0BVnrmMiY.VwuXP U1RlXMUA_w60rpdF3gTI- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Subject: Re: svn commit: r320579 - head/usr.bin/patch To: Alexey Dokuchaev Cc: cem@freebsd.org, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers References: <201707022100.v62L0Ume001253@repo.freebsd.org> <20170703181727.GA99316@FreeBSD.org> <20170703191456.GB99316@FreeBSD.org> From: Pedro Giffuni Organization: FreeBSD Project Message-ID: <9424d169-aff1-7a9f-f435-88422305db8d@FreeBSD.org> Date: Mon, 3 Jul 2017 14:23:36 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170703191456.GB99316@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2017 19:25:28 -0000 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.