From nobody Fri Feb 11 06:49:08 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2088A19C678B; Fri, 11 Feb 2022 06:49:13 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jw43F0K6kz4r7n; Fri, 11 Feb 2022 06:49:13 +0000 (UTC) (envelope-from avg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644562153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4V+iiiwBczLC0pcSY47Qq5sHG4YsjLrMlGZztIzjPVg=; b=F5QJdWe/nX2ll/KV8prOy3QIN8vmy8uX7z9PNnGtqF9KzfuwPhhj+Q3p5ldQSJUSMJi7K0 HSNEW1f6/9kfwKzOPzkXrTT3dyPVxDwH8uxBoWEOniIXHqnix9p6B8aTqRsgrymOK8p05e Pm3rhYE8WW4D/u1GWrQmuh1Na8rcYxTRf2rUGus/y9/TJ2yyaEsuyou64O4piuz+gHoF5T Nc8sOowx5rtq5bovuM3vYWjBto414OY4j/XQJjzrk8E0MOcG2JE/PppYj59y8mx7f0Nnnf TUGndWCl7GmWPeDTwIxQUgXGElRnvXpfobocmNq2+TZVteRcM2RQfknbxq/MMg== Received: from [192.168.0.88] (unknown [195.64.148.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: avg/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id E746C8E0B; Fri, 11 Feb 2022 06:49:11 +0000 (UTC) (envelope-from avg@FreeBSD.org) Message-ID: <98e82b4c-021c-10dc-feb5-a29613fad43f@FreeBSD.org> Date: Fri, 11 Feb 2022 08:49:08 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:91.0) Gecko/20100101 Firefox/91.0 Thunderbird/91.5.1 From: Andriy Gapon Subject: Re: git: b1f7154cb125 - main - gitignore: ignore vim swap files & .rej/.orig Content-Language: en-US To: Andrew Gallatin , "Alexander V. Chernikov" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: gallatin@netflix.com, Conrad Meyer References: <202201170935.20H9ZM3T069547@gitrepo.freebsd.org> <72061959-88f8-d2ee-b4e9-f09ca084411e@cs.duke.edu> In-Reply-To: <72061959-88f8-d2ee-b4e9-f09ca084411e@cs.duke.edu> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644562153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4V+iiiwBczLC0pcSY47Qq5sHG4YsjLrMlGZztIzjPVg=; b=xx12ljYKrF/BWiwj/QqUzwiwmxH9PZRKBnmdeUJfous1eOoHkilSjClD28IMB3pFQujg+x ijiLn/xtMiLZX9Z53b8P2MAeufnVO5ZkTIAH9xcwtsnWT2N4GkomgU2vzboJbTVM4S74fK m2zEKcNvUTC8LlOgOfwc1IlLASVTjOdhFGjiw8tzL6gQM3jmVJt7njWgb9/RvALsIKEKS7 3dWDdqds9dxtrq41668qz5lWgTmf6PV/QSBbV8RUr8RAk/pV44+x2zBQI9MgAKiD4fozOA /YQ+OWMd9l9aP7P32j6ZYrb1m5YKXxviDYmFduOiW7+5Lo6sf6xTIlBDirmlOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644562153; a=rsa-sha256; cv=none; b=doTip2xf2FY55SQsm/KFTtcG1oviBpG0Hg5ITdc8TL6KHt4adRzri0unV2nZAcf39nchP1 R6Y2tCI3gc0Qny6+rcd/vCr+vK5C6PmUPzPJjG2mcDiUqfYbdzD/og1zsW2RcUUlz2Fxks XoYWTgbUggEB2iPZgQ8BmLoQ3w64Ez0xsv9QAD/yvTRYQNT0+1sZ0CikUcqIZkhQTL75Fc m8Jx7s5OuZlhTLJbG24I+90tjOPex4afilbQwB7m0hF3pnhXzyOC0oE4y9aGH7F6DewME8 S93tx+BTX162TLrSvw94T8r7NkHjZexGl52etKeYtUxLiHwYmBPOu5dG5WOoKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 11/02/2022 03:25, Andrew Gallatin wrote: > On 1/17/22 04:35, Alexander V. Chernikov wrote: >> The branch main has been updated by melifaro: >> >> URL: >> https://urldefense.com/v3/__https://cgit.FreeBSD.org/src/commit/?id=b1f7154cb12517162a51d19ae19ec3f2dee88e11__;!!OToaGQ!4Lozvj8S2Opxre6qHuywX_aNhwm1heXl1CyQyb0N5f_fiBJEkTQGhLzE7KlqqP9C7A$ >> >> >> commit b1f7154cb12517162a51d19ae19ec3f2dee88e11 >> Author:     Alexander V. Chernikov >> AuthorDate: 2022-01-08 16:14:47 +0000 >> Commit:     Alexander V. Chernikov >> CommitDate: 2022-01-17 09:35:15 +0000 >> >>      gitignore: ignore vim swap files & .rej/.orig >>      Reviewed by:    cem, avg >>      MFC after:      2 weeks > > > Hi, > > I was wondering if you might consider reverting this change? > Alternatively, can you teach me how to override this file > locally without carrying a diff? > > I'm asking because this makes life painful for my workflow. > > Having git clean be able to handle .orig and .rej is incredibly > handy when applying large patch sets.  It makes finding a rejected > patch as simple as 'git clean -n | grep rej'. > > Also, when directories are removed *AND* they have an errant > .orig or .rej file remaining in them, git rm will not garbage > collect the directory.  This causes the build to fail.  I used > to use the trick of 'git clean -nd' to find such directories, but > now they are hidden.   This scenario just cost me hours of parsing > make output, trying to figure out why my build had failed. I cannot answer your direct question and I understand that the workflow you have is the workflow you are used to. But... I personally prefer "modern style" patching and dealing with conflicts, etc. Especially when dealing with a version control system and git in particular. Those .orig and .rej files do not seem to be useful at all in the first place. I would typically apply a patch either with git apply -3 (and git is configured with merge.conflictstyle diff3) or gpatch --merge=diff3 depending on where the patch came from (gpatch is the GNU patch from devel/patch). For me it's much more convenient to deal with inline conflict markers. P.S. And more directly to your question, find(1) still works :) -- Andriy Gapon