From nobody Fri Feb 11 16:10:08 2022 X-Original-To: dev-commits-src-main@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 8474F19C2D0A for ; Fri, 11 Feb 2022 16:10:22 +0000 (UTC) (envelope-from gallatin@netflix.com) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JwJVj4tQmz3n6P for ; Fri, 11 Feb 2022 16:10:21 +0000 (UTC) (envelope-from gallatin@netflix.com) Received: by mail-ed1-x534.google.com with SMTP id u18so17226094edt.6 for ; Fri, 11 Feb 2022 08:10:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netflix.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ak1XyIErYF9Nhw/S2BnQkbNo+zAGc6/4kYAEt6V4/UM=; b=oSlbwvIqaxJ+ev/AjiurtAe3VKIvrd5hBGzVxIDvnbVBBXzx74WGxJax/I/cYqvyt9 4czPdKw+nfzxLI/F6qKVXJvyRa7Oi/WgwXVLIoxlavmFVD1ohjgfOBl/RGqAqDHZKiI6 wqvznkqyBQ4QaGpx+ZpF3v2FBUxJajcOAnk0A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ak1XyIErYF9Nhw/S2BnQkbNo+zAGc6/4kYAEt6V4/UM=; b=74J2AeZLewB9LWBoGULCeBqEJerLNqVo0IsjO8kMKhAkJPevVEXSjYNdPa55RlgrgK wPLDBnqF+FCSaT8X9mD3VuAPa+EBInwFh5+ykm4Xni4n9ZvhtOp+z3RUJHUIiJHjJYJy sNR//fhkEDets6BPuLuOOV6+W/n0fHJg1LI6Ecfm3ztNTmIAPj/0h6Xr9l1qqjxArIsZ 0/D6fBI+bZA26vTAFMk290LagFdI3OD+pwwMk5FGIyq5LPRily+CllM6BpIInEmBhUVx eZOfhCfhfoNqeP+Y1Txv8eaT49WQzxcEwT59yRl+9wTMo2PbygXK8LWo5NAQGXD/WZOS Zk7w== X-Gm-Message-State: AOAM531xcM/MetnVNd+MaAgd3MWfQ+YMWgnAZZkTyW3wuX8lPp0/6dZw N9QtuotIlbYjcRvKFZFJde4P5V65KvtQWV0TkyDZ X-Google-Smtp-Source: ABdhPJy4LmVTd5rDLx8CEyAvlGCk1nM1iAg07XRvem0ZCR6MUUbFbWtx0WU3eRogODTUW3+IUR/HajWeU0ea/+SMBf4= X-Received: by 2002:a05:6402:607:: with SMTP id n7mr2722735edv.205.1644595820450; Fri, 11 Feb 2022 08:10:20 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202201170935.20H9ZM3T069547@gitrepo.freebsd.org> <72061959-88f8-d2ee-b4e9-f09ca084411e@cs.duke.edu> <4FC1EDC4-9F20-4271-B468-715A1727AC8A@FreeBSD.org> <4f4f6a83-3def-4938-6e40-5460486cc415@FreeBSD.org> <898c0071-66bc-db5f-b70d-72429d167279@FreeBSD.org> <0a83179a-6bcc-a6e6-7719-28c7b5f2aac1@FreeBSD.org> In-Reply-To: From: Drew Gallatin Date: Fri, 11 Feb 2022 11:10:08 -0500 Message-ID: Subject: Re: git: b1f7154cb125 - main - gitignore: ignore vim swap files & .rej/.orig To: Renato Botelho Cc: Kristof Provost , Andrew Gallatin , "Alexander V. Chernikov" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Conrad Meyer , Andriy Gapon Content-Type: multipart/alternative; boundary="000000000000adddfd05d7c04de3" X-Rspamd-Queue-Id: 4JwJVj4tQmz3n6P X-Spamd-Bar: ------------- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=netflix.com header.s=google header.b=oSlbwvIq; dmarc=pass (policy=reject) header.from=netflix.com; spf=pass (mx1.freebsd.org: domain of gallatin@netflix.com designates 2a00:1450:4864:20::534 as permitted sender) smtp.mailfrom=gallatin@netflix.com X-Spamd-Result: default: False [-14.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[netflix.com:s=google]; FREEFALL_USER(0.00)[gallatin]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; NEURAL_HAM_SHORT(-1.00)[-1.000]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[netflix.com:+]; DMARC_POLICY_ALLOW(-0.50)[netflix.com,reject]; RCPT_COUNT_SEVEN(0.00)[9]; WHITELIST_DMARC(-7.00)[netflix.com:D:+]; MLMMJ_DEST(0.00)[dev-commits-src-main]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::534:from]; WHITELIST_SPF_DKIM(-3.00)[netflix.com:d:+,netflix.com:s:+]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N --000000000000adddfd05d7c04de3 Content-Type: text/plain; charset="UTF-8" Well, they require custom aliases and configs and do not work exactly as before. Adding -e '*.obj' at least prevents it from descending into our nanobsd .obj directories which are owned by root and don't have r+o (which causes 40 lines of terminal spam). And they are aliases, so 15 years of muscle memory no longer work. The whole problem is that git is backwards. I should be able to locally override the repo config without resorting to command lines,aliases and creative hacks, but I cannot. On Fri, Feb 11, 2022 at 10:36 AM Renato Botelho wrote: > On 11/02/22 12:21, Drew Gallatin wrote: > > Thanks. IMHO, its still not nearly as good as being able to use > > standard tools, and I'd still really prefer the .orig and .rej rules > > were backed out.. > > All examples I sent use `git clean`, which is a standard tool. Unless I > missed something. > > -- > Renato Botelho > --000000000000adddfd05d7c04de3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Well, they require custom aliases and configs and do = not work exactly as before.=C2=A0 Adding -e '*.obj' at least preven= ts it from descending into our nanobsd .obj directories which are owned by = root and don't have r+o (which causes 40 lines of terminal spam).
=

And they are aliases, so 15 years of muscle memory no l= onger work.

The whole problem is that git is b= ackwards.=C2=A0 I should be able to locally override the repo config withou= t resorting to command lines,aliases and creative hacks, but I cannot.
<= /div>



On Fri, Feb 11, 2022 at 10:36 AM Ren= ato Botelho <garga@freebsd.org&= gt; wrote:
On 11= /02/22 12:21, Drew Gallatin wrote:
> Thanks.=C2=A0 IMHO, its still not nearly as good as being able to use =
> standard tools, and I'd still really prefer the .orig and .rej rul= es
> were backed out..

All examples I sent use `git clean`, which is a standard tool.=C2=A0 Unless= I
missed something.

--
Renato Botelho
--000000000000adddfd05d7c04de3--