From owner-freebsd-git@freebsd.org Sun Dec 6 02:00:18 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B61134AF648 for ; Sun, 6 Dec 2020 02:00:18 +0000 (UTC) (envelope-from jmehr@umn.edu) Received: from mta-p5.oit.umn.edu (mta-p5.oit.umn.edu [134.84.196.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CpV5F6nbYz501s for ; Sun, 6 Dec 2020 02:00:17 +0000 (UTC) (envelope-from jmehr@umn.edu) Received: from localhost (unknown [127.0.0.1]) by mta-p5.oit.umn.edu (Postfix) with ESMTP id 4CpV5D5Xtbz9vYQw for ; Sun, 6 Dec 2020 02:00:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p5.oit.umn.edu ([127.0.0.1]) by localhost (mta-p5.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZSmS9S974lY9 for ; Sat, 5 Dec 2020 20:00:16 -0600 (CST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p5.oit.umn.edu (Postfix) with ESMTPS id 4CpV5D2SzLz9vYQW for ; Sat, 5 Dec 2020 20:00:16 -0600 (CST) DMARC-Filter: OpenDMARC Filter v1.3.2 mta-p5.oit.umn.edu 4CpV5D2SzLz9vYQW DKIM-Filter: OpenDKIM Filter v2.11.0 mta-p5.oit.umn.edu 4CpV5D2SzLz9vYQW Received: by mail-wm1-f72.google.com with SMTP id z12so3893868wmf.9 for ; Sat, 05 Dec 2020 18:00:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=dZ7j4fKWKrbFIjcoLAixcrLf8XXgtBL5eC19pWNBkRA=; b=ju10EnRjibo+1IFHPBJXRaWWhaJJm6a8i77dT3yhpT63Tx21QR1J3ZGcNdBAj4YZ8L EEEerjKaU6YQ/sZaya47+JEqQ2pr7tT4E/iAVL5UzeW5iR4bBtUTlg6EM0zbjjKoTvop jbMjJWcHiQ+UOASlAheQcRzXe6j7pHu4G8oypc5TFLyVgmpMYwt2vs7lT6vVZDpP2RxM KuHFFovdVxr2tEmL3Azew6Zwf3XeWKn9ZNNgTQ3bmNPsWfuLfVgpMEHcO3zq4SWZXLLQ OjohQVUoGqZ5OrIbk9ONWSngsXPAhOBXO/ForEvoepGTVvLGXcVQ4DQmmcv0O+i39p1S 1H1g== X-Gm-Message-State: AOAM532xNUoqgqYcIVC2t4B/HlkFxCBdEcinvO89PW03KV4gPW4LIy7A 257y661uFiBBU2cdlyz8eOaJBEBV3euimo+FMmBjqhyHDUdhJGQW1MP4ErS1Rs0iReVTHtYDeaD l2YMwCAW0/RzQFz2bb6r4HHnw6ZgeptAhBcbrLg== X-Received: by 2002:a1c:e342:: with SMTP id a63mr11787953wmh.64.1607220014933; Sat, 05 Dec 2020 18:00:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGHCJcP52lEQakg+MC7jKerAQflgTBPasqURIljLyEx36v8kDtIA4GnzQQKaQu8Ln5x6wWsAPSiFj/wDnMHs0= X-Received: by 2002:a1c:e342:: with SMTP id a63mr11787937wmh.64.1607220014710; Sat, 05 Dec 2020 18:00:14 -0800 (PST) MIME-Version: 1.0 From: John Mehr Date: Sat, 5 Dec 2020 20:00:03 -0600 Message-ID: Subject: gitup To: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4CpV5F6nbYz501s X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.70 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCVD_COUNT_FIVE(0.00)[5]; R_DKIM_ALLOW(-0.20)[umn.edu:s=google]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:134.84.196.192/27]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RCPT_COUNT_ONE(0.00)[1]; DWL_DNSWL_LOW(-1.00)[umn.edu:dkim]; RCVD_IN_DNSWL_MED(-0.20)[134.84.196.205:from]; DKIM_TRACE(0.00)[umn.edu:+]; DMARC_POLICY_ALLOW(-0.50)[umn.edu,quarantine]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:217, ipnet:134.84.0.0/16, country:US]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2020 02:00:18 -0000 Hello everyone, I've been plugging away at writing gitup, a BSD licensed git clone/pull tool and I'm pleased to announce I've got a working prototype up on github at: https://github.com/johnmehr/gitup Much like its predecessor, net/svnup, gitup is intended for non-developers who just need to synchronize a local repository without the additional overhead required by the official git client and is not intended as a feature rich, drop-in replacement for it. The code is beta, so the usual caveats/warnings (don't use it in a production environment, make sure you've got backups, dont (yet) run as root) apply. I think I've got most of the common use cases taken care of but there's always room for improvement so please don't hesitate to offer suggestions, comments and/or constructive criticism. Thanks! -- John Mehr Software/Web Developer + Database Administrator + Data Specialist Humphrey School of Public Affairs, University of Minnesota From owner-freebsd-git@freebsd.org Sun Dec 6 02:54:06 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F0DD6469809 for ; Sun, 6 Dec 2020 02:54:06 +0000 (UTC) (envelope-from dan@langille.org) Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CpWHK5QcRz53N1 for ; Sun, 6 Dec 2020 02:54:05 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id AB1E885F; Sat, 5 Dec 2020 21:54:03 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 05 Dec 2020 21:54:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; s=fm2; bh=c BQuyf4RzC/psQzwLQ2yn15ZIEMVuewYoeOr5XOCXTc=; b=rvQa37lrhYCOrqAXk wDUkkzzDWyG/QlfhfMGPxtrJeKeKmPBxoNuQryY0hlDdcoEqL/KFESy+U3QrYjIK VV0OCaFlKmqfUqI6Dh7hB4fBRGh5eqYRx3ScZQvQrbU40YKPvOnWG5kGPAaV5lam Dd1NlsMwuWtcZXzmDPpKrFklcgtLO4DIjX+ZYWx9xdhFIYy+f1hYQ3ts9VVIcUR9 75YUmN11YX/puGKMO3YPn9+I99phUmptxZmVZj/V68Mq0zYKufi66i4x+5efAWfi VykQgW+PvJ6E2Wt758tbwP6WvfoUIXQ8vq/XxBLwCS0KNbK0vN15igoeLnqrE9YH SRxqg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=cBQuyf4RzC/psQzwLQ2yn15ZIEMVuewYoeOr5XOCX Tc=; b=L2qNHoGbLGl0MYAs/uTaVblnlTca8uG7WpxfDnMVYX9mYAO3QdLKZ7jhN el1aFQAs9283QoACJ9oWTqI8ruLp0wjGDZlLy73rtxDDKdi3wgtRBOFyGIi365iQ OQrQOveRlymxvHocsMlcX5gsTEhPi6JaZvQXbU6+1juCATU7OlNobD8dMlldXlZH oXjXJIo9HZjLJ4M9MtCflSW5IUX23cpj/1I1jsXUfu4kAemLnymdn1wxvXnHEwui qCzTS7vNrBpJZkXdThn0bkrfmKII9tdq0wgYw36AI6OCaqrcg0rbMX0W6R1BQYUj k/rnP8Fpa5wMVjYdzRdlHbS4oP0nQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejuddghedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurheptggguffhjgffgffkfhfvofesthhqmhdthhdtvdenucfhrhhomhepffgrnhcu nfgrnhhgihhllhgvuceouggrnheslhgrnhhgihhllhgvrdhorhhgqeenucggtffrrghtth gvrhhnpeejtedvgeelfefhveejjeejjeefueeuvdejheetjeevkeelhfegudeiieehlefh gfenucfkphepjedvrdejkedrudeltddrudeltdenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpegurghnsehlrghnghhilhhlvgdrohhrgh X-ME-Proxy: Received: from [10.222.78.31] (pool-72-78-190-190.phlapa.fios.verizon.net [72.78.190.190]) by mail.messagingengine.com (Postfix) with ESMTPA id EC53024005A; Sat, 5 Dec 2020 21:54:02 -0500 (EST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: gitup From: Dan Langille In-Reply-To: Date: Sat, 5 Dec 2020 21:54:01 -0500 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <142E5BAE-97E3-432E-A7AD-24D3DE8AA105@langille.org> References: To: John Mehr X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4CpWHK5QcRz53N1 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm2 header.b=rvQa37lr; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=L2qNHoGb; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 64.147.123.20 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-3.60 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.20]; RWL_MAILSPIKE_GOOD(0.00)[64.147.123.20:from]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RECEIVED_SPAMHAUS_PBL(0.00)[72.78.190.190:received]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.147.123.20:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:11403, ipnet:64.147.123.0/24, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm2,messagingengine.com:s=fm1]; FREEFALL_USER(0.00)[dan]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[64.147.123.20:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.20:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2020 02:54:07 -0000 > On Dec 5, 2020, at 9:00 PM, John Mehr via freebsd-git = wrote: >=20 > I think I've got most of the common use cases taken care of but = there's > always room for improvement so please don't hesitate to offer = suggestions, > comments and/or constructive criticism. Thanks! Can one do the equivalent of an 'svn export'? That is, check out a tag? --=20 Dan Langille - BSDCan / PGCon dan@langille.org From owner-freebsd-git@freebsd.org Sun Dec 6 04:41:02 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BBA2F46B7C9 for ; Sun, 6 Dec 2020 04:41:02 +0000 (UTC) (envelope-from jmehr@umn.edu) Received: from mta-p6.oit.umn.edu (mta-p6.oit.umn.edu [134.84.196.206]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CpYfj5PQWz57w2 for ; Sun, 6 Dec 2020 04:41:01 +0000 (UTC) (envelope-from jmehr@umn.edu) Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 4CpYRB3dl6z9vYVc for ; Sun, 6 Dec 2020 04:31:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cVBjnZSvrcLV for ; Sat, 5 Dec 2020 22:31:02 -0600 (CST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 4CpYRB0jsVz9vYTk for ; Sat, 5 Dec 2020 22:31:01 -0600 (CST) DMARC-Filter: OpenDMARC Filter v1.3.2 mta-p6.oit.umn.edu 4CpYRB0jsVz9vYTk DKIM-Filter: OpenDKIM Filter v2.11.0 mta-p6.oit.umn.edu 4CpYRB0jsVz9vYTk Received: by mail-wr1-f71.google.com with SMTP id v1so3867966wri.16 for ; Sat, 05 Dec 2020 20:31:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=woAWvKND53Ub2UhuqeFn8nGWQuXNIgh9uM4xYDKMLOM=; b=XhWJne/GCvEGsbo87FFmZL6VVvmWVrTgTY/LPWfnHUMlno7hYJjCtgfHUBXuxAddgi GRgQ24fTMVWgBGbkXmbKBa/5PIWnaWo2vK8qRs1YkxayJWTmxPmvbmj6vi/B/eeTO427 UDz+aLSM1DXEnduQMVbrQpryaS5eNVW/9Q8GzqTqdlv8U4bEvnW9SvKneMfTBIC+meAf AqMosroBkZpQb8ECRa4WbiMTCCwjq7tKGavy72TDO5DOmZFbdbfDclvNIjpfK8Inu5pO yc3HfMluEFiZKFy7uJ/Ag5VKplQ/RBqwbJir+Ek0w72snOIkjw/wYOYDKQnJTnIZ/OCa vmgA== X-Gm-Message-State: AOAM532synnlLjidEv9A+Yy2mLeXWipZ0HlfG4DW5jkJP2zS7gqIVy3n J+vEs2+c3Z4i2VK1dFur/8wjZAVh1g1sBNLJx7ZlcxP3dEP1SkSLIiKSKm4G3DyvC9eCynmWAdT NLve+6HoRKHsFvEDZ3Ya+P3QMs5MY5xAcJOPseg== X-Received: by 2002:a1c:2cc2:: with SMTP id s185mr11508718wms.111.1607229060740; Sat, 05 Dec 2020 20:31:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJyUMfovAOp9IibZWH7oq3F2y5cgwJhu0JGa4PX30sO1O5raXVuW4/N7LTI2wfYeqQvkAGgJtMEwgdKuIFRh5z0= X-Received: by 2002:a1c:2cc2:: with SMTP id s185mr11508713wms.111.1607229060562; Sat, 05 Dec 2020 20:31:00 -0800 (PST) MIME-Version: 1.0 References: <142E5BAE-97E3-432E-A7AD-24D3DE8AA105@langille.org> In-Reply-To: <142E5BAE-97E3-432E-A7AD-24D3DE8AA105@langille.org> From: John Mehr Date: Sat, 5 Dec 2020 22:30:49 -0600 Message-ID: Subject: Re: gitup To: Dan Langille Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4CpYfj5PQWz57w2 X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.70 / 15.00]; ARC_NA(0.00)[]; RWL_MAILSPIKE_VERYGOOD(0.00)[134.84.196.206:from]; R_DKIM_ALLOW(-0.20)[umn.edu:s=google]; RCVD_COUNT_FIVE(0.00)[5]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:134.84.196.192/27]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DWL_DNSWL_LOW(-1.00)[umn.edu:dkim]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[umn.edu:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[umn.edu,quarantine]; RCVD_IN_DNSWL_MED(-0.20)[134.84.196.206:from]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:217, ipnet:134.84.0.0/16, country:US]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2020 04:41:02 -0000 I just pushed an update that adds a command line option -t that will allow you to specify a tagged commit to retrieve. Thanks! On Sat, Dec 5, 2020 at 8:54 PM Dan Langille wrote: > > On Dec 5, 2020, at 9:00 PM, John Mehr via freebsd-git < > freebsd-git@freebsd.org> wrote: > > > > I think I've got most of the common use cases taken care of but there's > > always room for improvement so please don't hesitate to offer > suggestions, > > comments and/or constructive criticism. Thanks! > > Can one do the equivalent of an 'svn export'? That is, check out a tag? > > -- > Dan Langille - BSDCan / PGCon > dan@langille.org > > > > -- John Mehr Software/Web Developer + Database Administrator + Data Specialist Humphrey School of Public Affairs, University of Minnesota From owner-freebsd-git@freebsd.org Sun Dec 6 07:28:57 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A45A647500C for ; Sun, 6 Dec 2020 07:28:57 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CpdNS36n3z3JS1 for ; Sun, 6 Dec 2020 07:28:56 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (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) (No client certificate requested) by maybe.home.utahime.org (Postfix) with ESMTPS id 9A34A1CF6E; Sun, 6 Dec 2020 16:28:51 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1607239731; bh=1jjiokW93OkKaLUlrDKcrUZdhz6ZCPT/347gMuReCTY=; h=Date:To:Subject:From:In-Reply-To:References; b=T1Ak4R6Olx2PPFagiDEFG2STieX1Z0soNI6yeGbf/fgxlFQzXJvUPyMyZAMkp+OxB FdCsYvPOEf8PAodsgjxjJnw9RTxIIn3bebYxZ89swzQSR6Gcp/lZBYH1yNcx+sxzey vG6GD8bnMF7iB/qnHNx6IkcJz2WxRDj6XiA81yVSFD6Qw+DEPkuyiYoSKzy1eVvl/z rHWQM0XUmw1xfZXWuGVbS7a2j9BDbON52YUFHykrOpp+LKXsFimHDP5gpS2+AwOZbW 5Y20UyWn0JDc9/KRhXknnBKaeYvZWyzvRCG7bEkGW1mNir5Cu60YASOjc9cn9iXGsa vtTZHI2ORsIqw== Received: from localhost (rolling.home.utahime.org [192.168.174.11]) (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) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id 85B4242EAF; Sun, 6 Dec 2020 16:28:50 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.0 at eastasia.home.utahime.org Date: Sun, 06 Dec 2020 16:28:12 +0900 (JST) Message-Id: <20201206.162812.193024218114021427.yasu@utahime.org> To: jmehr@umn.edu, freebsd-git@freebsd.org Subject: Re: gitup From: Yasuhiro KIMURA In-Reply-To: References: X-Mailer: Mew version 6.8 on Emacs 27.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4CpdNS36n3z3JS1 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=utahime.org header.s=maybe2019112701 header.b=T1Ak4R6O; dmarc=none; spf=pass (mx1.freebsd.org: domain of yasu@utahime.org designates 183.180.29.210 as permitted sender) smtp.mailfrom=yasu@utahime.org X-Spamd-Result: default: False [-0.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org]; TO_DN_NONE(0.00)[]; HFILTER_HELO_IP_A(1.00)[maybe.home.utahime.org]; HFILTER_HELO_NORES_A_OR_MX(0.30)[maybe.home.utahime.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[utahime.org:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[183.180.29.210:from]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[utahime.org]; SPAMHAUS_ZRD(0.00)[183.180.29.210:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2020 07:28:57 -0000 From: John Mehr via freebsd-git Subject: gitup Date: Sat, 5 Dec 2020 20:00:03 -0600 > Hello everyone, > > I've been plugging away at writing gitup, a BSD licensed git clone/pull > tool and I'm pleased to announce I've got a working prototype up on github > at: > > https://github.com/johnmehr/gitup > > Much like its predecessor, net/svnup, gitup is intended for non-developers > who just need to synchronize a local repository without the additional > overhead required by the official git client and is not intended as a > feature rich, drop-in replacement for it. > > The code is beta, so the usual caveats/warnings (don't use it in a > production environment, make sure you've got backups, dont (yet) run as > root) apply. > > I think I've got most of the common use cases taken care of but there's > always room for improvement so please don't hesitate to offer suggestions, > comments and/or constructive criticism. Thanks! Great! I made devel/gitup port. https://github.com/yasuhirokimura/freebsd-ports/tree/gitup/devel/gitup If someone would like to test it with his ports tree, please take following steps. 1. cd /tmp 2. fetch https://github.com/yasuhirokimura/freebsd-ports/commit/gitup.patch 3. cd /usr/ports 4. Apply patch to ports tree 4.1. svn patch /tmp/gitup.patch (for Subversion user) 4.2. git apply /tmp/gitup.patch (for Git user) 4.3. patch -p1 -i /tmp/gitup.patch (for svnup user) It should work with both head and quarterly branch. Enjoy. --- Yasuhiro KIMURA From owner-freebsd-git@freebsd.org Sun Dec 6 08:51:21 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 98EA04767DC for ; Sun, 6 Dec 2020 08:51:21 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CpgCY3lFBz3P0y for ; Sun, 6 Dec 2020 08:51:21 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7E88B476763; Sun, 6 Dec 2020 08:51:21 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7E4B447675F for ; Sun, 6 Dec 2020 08:51:21 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CpgCX5pPGz3P3M for ; Sun, 6 Dec 2020 08:51:20 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0B68pHkp055663 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sun, 6 Dec 2020 09:51:18 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sun, 6 Dec 2020 09:51:17 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: git@freebsd.org Subject: HEADS UP: src hashes will respin/change this Sunday Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4CpgCX5pPGz3P3M X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; local_wl_from(0.00)[freebsd.org] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2020 08:51:21 -0000 Folks, it's with a heavy heart that I have to announce that I will need to push new hashes to cgit-beta.FreeBSD.org/src today. SVN is the gift that keeps on giving and the converter missed 2 vendor merge commits in October. The history till early October will not change, but afterwards the upstream's `main` will diverge from what ya'll have checked out currently. To be clear, the _content_ of the commits stays the same, but additional metadata in the form of a 2nd parent will appear on 2 commits. For local work you should be able to just merge the new origin/main into your work (you may never push such a branch to the final repo though), or rebase/cherry-pick your work onto the new origin/main (you may push such a linear history to the official repos later). Please don't hesitate to reach out should you need help with that. Also note that this has NOT been pushed yet, I'm doing more testing and verification and there's a slight chance this might run into Monday. Sorry folks, Uli From owner-freebsd-git@freebsd.org Sun Dec 6 17:33:48 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E55844A3F53 for ; Sun, 6 Dec 2020 17:33:48 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CptpN5Bzfz4b4Q for ; Sun, 6 Dec 2020 17:33:48 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id B0BF44A3F52; Sun, 6 Dec 2020 17:33:48 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B08664A3EEE for ; Sun, 6 Dec 2020 17:33:48 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CptpM6lmkz4Znt for ; Sun, 6 Dec 2020 17:33:47 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f54.google.com with SMTP id o11so7710293ote.4 for ; Sun, 06 Dec 2020 09:33:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=qb3CtE9X6S5LfFoK+lJaujIvlxCWSR2My/T0+UUP0Yc=; b=h3En36kPBDI+wn/xAldlcHqL9QRIHYvK1FG59a/7a5yPQJwDvW/WWYlPdoquuAUuXc 2UiPLHJPkuFki5hWeCk2Lg+aQw1dpLWcMJmrZypmrtyumq15bbBRWTKbq5N9jSBVTaY7 auCPEn4Q7I5tp/KijS1wIjGjZ+/CWjKgXGT+Q9zduS/d//ORk0B8ZVQXbAgoDetYCSiF bm+QuYXT+vXMJuwfT7lQ3gOXtdgc2ErGWypfjiJU7kk/kgsS2gNMUQhDmwFRDM5xWiQk b22CvXae/TL8ySNM3eA08wGEJqEst0O5ZMhVjCrgN65gWa2ojCPgqQAuKmSYasfC0oB4 8WpA== X-Gm-Message-State: AOAM533RL6A2aDSDDIsoB+Xnri8I8H3rOSYj061ZL3Oghi0ZXP8BB0dl yuUHhdfz9U5v8lpa3T7VkiEelXhMoVRJAgwwO6bfWneTO4k= X-Google-Smtp-Source: ABdhPJyIQ9nVEgaKwGjP7lsFdd6XMx4lHLnSKXvIsTDvkz8jgH0/hc3ieGFNwsJbj51k3D8PuOaARIQIcRwTA9/JOcQ= X-Received: by 2002:a05:6830:1f52:: with SMTP id u18mr10225047oth.71.1607276026112; Sun, 06 Dec 2020 09:33:46 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Sun, 6 Dec 2020 18:33:34 +0100 Message-ID: Subject: Re: HEADS UP: src hashes will respin/change this Sunday To: git@freebsd.org X-Rspamd-Queue-Id: 4CptpM6lmkz4Znt X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.210.54 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; RWL_MAILSPIKE_GOOD(0.00)[209.85.210.54:from]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_DN_NONE(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.210.54:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[209.85.210.54:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.54:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[git] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2020 17:33:49 -0000 On Sun, Dec 6, 2020 at 9:51 AM Ulrich Sp=C3=B6rlein wrote= : > Folks, > > it's with a heavy heart that I have to announce that I will need to push > new hashes to cgit-beta.FreeBSD.org/src today. SVN is the gift that > keeps on giving and the converter missed 2 vendor merge commits in > October. > > The history till early October will not change, but afterwards the > upstream's `main` will diverge from what ya'll have checked out > currently. > > To be clear, the _content_ of the commits stays the same, but additional > metadata in the form of a 2nd parent will appear on 2 commits. For local > work you should be able to just merge the new origin/main into your work > (you may never push such a branch to the final repo though), or > rebase/cherry-pick your work onto the new origin/main (you may push such > a linear history to the official repos later). > > Please don't hesitate to reach out should you need help with that. > Also note that this has NOT been pushed yet, I'm doing more testing and > verification and there's a slight chance this might run into Monday. > > Sorry folks, > Uli > This has _now_ been pushed. Sorry for the inconvenience, the converter will not make that same mistake again, that's for sure :) Cheers Uli From owner-freebsd-git@freebsd.org Wed Dec 9 08:16:33 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91138473B78 for ; Wed, 9 Dec 2020 08:16:33 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CrVJ13VL8z4bTv for ; Wed, 9 Dec 2020 08:16:33 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 760DA474483; Wed, 9 Dec 2020 08:16:33 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 75D21473B77 for ; Wed, 9 Dec 2020 08:16:33 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CrVJ12lNFz4bWy for ; Wed, 9 Dec 2020 08:16:33 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from weatherwax.trouble.is (weatherwax.trouble.is [IPv6:2a00:1098:82:3a::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "weatherwax.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 3771A27BA6 for ; Wed, 9 Dec 2020 08:16:33 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from rincewind.trouble.is (rincewind.trouble.is [95.216.22.234]) (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 "rincewind.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) by weatherwax.trouble.is (Postfix) with ESMTPS id 4CrVJ01wJhz168k for ; Wed, 9 Dec 2020 08:16:32 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4CrVHy5NCnz5ssD; Wed, 9 Dec 2020 08:16:30 +0000 (UTC) From: "Philip Paeps" To: git@freebsd.org Subject: Imminent tzdata import (was: Re: Vendor Imports in Subversion) Date: Wed, 09 Dec 2020 16:16:25 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5748) Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=_MailMate_E5140B18-A74E-420D-BA81-8CD5813DB348_="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2020 08:16:33 -0000 This is an OpenPGP/MIME signed message (RFC 3156 and 4880). --=_MailMate_E5140B18-A74E-420D-BA81-8CD5813DB348_= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2020-12-09 14:47:18 (+0800), Warner Losh wrote: > Greetings, > > The git working group is making final preparations for the cut over in = two > weeks (currently planned to start December 19). There's one item that's= > caused some recent problems that we'd like to ask the committer's help = on: > vendor imports. We've had a few vendor imports of late that have caused= > problems for the git converter. Imports should be done from the top lev= el > so that the merge info winds up in the right place. uqs@ has added code= to > defensive code to detect the recent problems, but we're not sure it wil= l > catch everything. > > So, over the next two weeks, we'd like to ask that committers refrain f= rom > doing vendor imports in the src tree for those cases where delay is > possible. For vendor imports that can't wait, due to security or other > serious issues, please coordinate with git@freebsd.org before doing the= > vendor import. If there's a confidential matter, you can contact me ( > imp@freebsd.org) or the core team instead. > > Thanks for your understanding... > > Warner > On behalf of the git working group I expect there will be one more tzdata import this year. Probably in the= next week or so. I could potentially hold this one off, but one of the timezones in Russia= is changing at short notice and we do have a sizeable number of users in= Russia. https://mm.icann.org/pipermail/tz/2020-December/029607.html It sounds like the timezone is changing on 27 December 2020 (argh) but we= won't know for sure until next week (argh argh). Given that tzdata imports are exceedingly trivial, perhaps this is actual= ly a best-case first import to try out the process? Happy to coordinate = with you guys. Philip -- = Philip Paeps Senior Reality Engineer Alternative Enterprises --=_MailMate_E5140B18-A74E-420D-BA81-8CD5813DB348_= Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEE9Xl/y/HxTiwoqUh7fGK8R3bJ8p4FAl/Qh9oACgkQfGK8R3bJ 8p5YRAf/Qllf5WcDOMd9v71iBZ+RajKMAGta4FjSC35mDbU8yNexlcStiaHVtm4D CYDCANvWsFomOFXahpdsOhVr4A300fV69012uS7bbQd+a4Imfc7w0l44lQrZpHOC N82PAPW4pYqLYQawWkKLmeBDJU9JDLL5IBcGduCALBkshAU9Fm0Vou+EurJnEmCo EjvErxO5DRtPJLVS5lA1q5WO4b++F4XxfZoIZWLyW6uLLWgnpoNG53ImqsqRVNZs TZygCUjI4b1UazzEsh8Qwauh9ZIh30mTTRgN6Ccp7gGIiVs1NEVuIdlVgipLjnp1 g4xhk+UUPuO/HAX67ZQWD+nrmAKahg== =qckF -----END PGP SIGNATURE----- --=_MailMate_E5140B18-A74E-420D-BA81-8CD5813DB348_=-- From owner-freebsd-git@freebsd.org Wed Dec 9 15:48:50 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 019D94A8AE0 for ; Wed, 9 Dec 2020 15:48:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CrhKs4WCDz3KNx for ; Wed, 9 Dec 2020 15:48:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 9AC4C4A8C96; Wed, 9 Dec 2020 15:48:49 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 996E24A88FF for ; Wed, 9 Dec 2020 15:48:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CrhKs3qB4z3KXR for ; Wed, 9 Dec 2020 15:48:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x743.google.com with SMTP id y18so1593871qki.11 for ; Wed, 09 Dec 2020 07:48:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=AU3quOTUZVOOmWZVUn421tn2ac9GdQYjFbUjwqKWXG0=; b=QMQRQ0W9oLCyiJobGGLVZZ6ObfUPtDWpiqiPuJ0sLFuHcwzpd91M+HJVVNbQZZP2DV H/mCnmeK5urGECDAp23clEWqhGBLWlv039Crl8PLcFsTFAcvukYt1cJiRvxQ4Xv0MKMu LxSlEscFb0ne9RJj20cCJJQFZ/N7xsx4cl9Xf63B4Zdh7ujJnJWrzOEPrZOFuerPEgD5 /zUX1vSd0wZuBYsSTaogvzgxwruU+VYBSOoUfJscleNp200zfaa0dhA5oC8bJZCly7H/ KLyNWhRWlDGDZ5rnbqtJbEGVUyqEZLIhrgsIc8qUQCVny8zqMvOTQ32vWK+uKg5mLXvD 6qTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=AU3quOTUZVOOmWZVUn421tn2ac9GdQYjFbUjwqKWXG0=; b=kbd90gOiUsWN5sX1BwSYGoxvIXJX4ub1HanNOdlQIJ8tc0OnKtSPylvdb/MfhYZUL9 gI5lbzoia8yknbRykPvgupAiJiMdsSk4wmFSkVSh2baP1o8W2YCObEwBrLtwJ2KpSt0y Lw3FOSeuqxdSDjE8Ks9/Qx+0haR+Eg5QcvVn7HrGJasirdyC/0MG/IOBD3lZLf6uLSpQ TPqeZr91jR8ly50QaNunh4zR+3KakipHNWpppujQ/OxThIhRQzkgSkhBEM28iU2Q0Rkc Jaip75lFN46izoTUYnUwAvY0SPL27auZ/h1AkpLnQ7mpjB+H82IzS97P4+J7qfqFDIze QVrQ== X-Gm-Message-State: AOAM532Qpvr3hZ3HTJLsc9vFzVKdZnUB5yKKzPEduAzuAT5KZ6RJslaR 4CK/pBZm5looD2Q+wdq3gx3w12ET/VtQpmMyYVmgrQ== X-Google-Smtp-Source: ABdhPJz3AJnmSCUSv86EmWGV8JGlQkrPCKTSxokheILB6xc46Xt5mksVoyrfUFEUAqmY+AqaFT9qtkXPxkQLDKTrmfU= X-Received: by 2002:a37:bf86:: with SMTP id p128mr3578514qkf.44.1607528928645; Wed, 09 Dec 2020 07:48:48 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 9 Dec 2020 08:48:37 -0700 Message-ID: Subject: Re: Imminent tzdata import (was: Re: Vendor Imports in Subversion) To: Philip Paeps Cc: git@freebsd.org X-Rspamd-Queue-Id: 4CrhKs3qB4z3KXR X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2020 15:48:50 -0000 On Wed, Dec 9, 2020 at 1:16 AM Philip Paeps wrote: > On 2020-12-09 14:47:18 (+0800), Warner Losh wrote: > > > Greetings, > > > > The git working group is making final preparations for the cut over in > two > > weeks (currently planned to start December 19). There's one item that's > > caused some recent problems that we'd like to ask the committer's help > on: > > vendor imports. We've had a few vendor imports of late that have caused > > problems for the git converter. Imports should be done from the top level > > so that the merge info winds up in the right place. uqs@ has added code > to > > defensive code to detect the recent problems, but we're not sure it will > > catch everything. > > > > So, over the next two weeks, we'd like to ask that committers refrain > from > > doing vendor imports in the src tree for those cases where delay is > > possible. For vendor imports that can't wait, due to security or other > > serious issues, please coordinate with git@freebsd.org before doing the > > vendor import. If there's a confidential matter, you can contact me ( > > imp@freebsd.org) or the core team instead. > > > > Thanks for your understanding... > > > > Warner > > On behalf of the git working group > > I expect there will be one more tzdata import this year. Probably in the > next week or so. > > I could potentially hold this one off, but one of the timezones in Russia > is changing at short notice and we do have a sizeable number of users in > Russia. > > https://mm.icann.org/pipermail/tz/2020-December/029607.html > > It sounds like the timezone is changing on 27 December 2020 (argh) but we > won't know for sure until next week (argh argh). > > Given that tzdata imports are exceedingly trivial, perhaps this is > actually a best-case first import to try out the process? Happy to > coordinate with you guys. > Thanks Philip for the heads up. This is the sort of timely data that makes sense not to delay. You've done a number of these in the past, so this should be OK. Please take extra care to ensure that the mergeinfo properties are done correctly at the high level. Unless someone else pipes up, please consider this approved. We're planning to start the conversion of December 19, so please try to have it done well ahead of that, iana willing :). Warner From owner-freebsd-git@freebsd.org Wed Dec 9 16:18:31 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 51B3A4A8E7D for ; Wed, 9 Dec 2020 16:18:31 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Crj071cXpz3Lbx for ; Wed, 9 Dec 2020 16:18:31 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 373A24A94AC; Wed, 9 Dec 2020 16:18:31 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 370344A9619 for ; Wed, 9 Dec 2020 16:18:31 +0000 (UTC) (envelope-from philip@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Crj070Ys9z3LSZ; Wed, 9 Dec 2020 16:18:31 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from weatherwax.trouble.is (weatherwax.trouble.is [46.235.227.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "weatherwax.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id E322E2BDCF; Wed, 9 Dec 2020 16:18:30 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from rincewind.trouble.is (rincewind.trouble.is [95.216.22.234]) (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 "rincewind.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) by weatherwax.trouble.is (Postfix) with ESMTPS id 4Crj0607M3z16Kt; Wed, 9 Dec 2020 16:18:30 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4Crj033vp7z5svr; Wed, 9 Dec 2020 16:18:27 +0000 (UTC) From: "Philip Paeps" To: "Warner Losh" Cc: git@freebsd.org Subject: Re: Imminent tzdata import (was: Re: Vendor Imports in Subversion) Date: Thu, 10 Dec 2020 00:18:23 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5748) Message-ID: <385AFFEC-CBBD-4715-B6B2-3D06F67B4969@freebsd.org> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2020 16:18:31 -0000 On 2020-12-09 23:48:37 (+0800), Warner Losh wrote: > On Wed, Dec 9, 2020 at 1:16 AM Philip Paeps > wrote: >> On 2020-12-09 14:47:18 (+0800), Warner Losh wrote: >>> The git working group is making final preparations for the cut over >>> in two weeks (currently planned to start December 19). There's one >>> item that's caused some recent problems that we'd like to ask the >>> committer's help on: vendor imports. We've had a few vendor imports >>> of late that have caused problems for the git converter. Imports >>> should be done from the top level so that the merge info winds up in >>> the right place. uqs@ has added code to defensive code to detect >>> the recent problems, but we're not sure it will catch everything. >>> >>> So, over the next two weeks, we'd like to ask that committers >>> refrain >>> from doing vendor imports in the src tree for those cases where >>> delay is possible. For vendor imports that can't wait, due to >>> security or other serious issues, please coordinate with >>> git@freebsd.org before doing the vendor import. If there's a >>> confidential matter, you can contact me (imp@freebsd.org) or the >>> core team instead. >>> >>> Thanks for your understanding... >> >> I expect there will be one more tzdata import this year. Probably in >> the next week or so. >> >> I could potentially hold this one off, but one of the timezones in >> Russia is changing at short notice and we do have a sizeable number >> of users in Russia. >> >> https://mm.icann.org/pipermail/tz/2020-December/029607.html >> >> It sounds like the timezone is changing on 27 December 2020 (argh) >> but we won't know for sure until next week (argh argh). >> >> Given that tzdata imports are exceedingly trivial, perhaps this is >> actually a best-case first import to try out the process? Happy to >> coordinate with you guys. > > Thanks Philip for the heads up. This is the sort of timely data that > makes sense not to delay. You've done a number of these in the past, > so this should be OK. Please take extra care to ensure that the > mergeinfo properties are done correctly at the high level. > Unless someone else pipes up, please consider this approved. We're > planning to start the conversion of December 19, so please try to have > it done well ahead of that, iana willing :). Thank you! I'll merge the new tzdata (with extra care and double checking) on the same day it comes out if it's before the 19th. If it comes out early next week, I'll give it the usual couple of days in HEAD before I MFC it. If it comes out closer to the 19th, I'll MFC it a bit sooner so 1) the dust has a bit of time to settle before the Git migration and 2) affected users get it sooner. I'm cautiously optimistic it'll come out next week, so it'll be business as usual for me. If the tzdata release does end up only happening after the 19th ... well ... we'll attack that dragon when it shows its tail. :-) I'll keep git@ posted whatever happens. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From owner-freebsd-git@freebsd.org Thu Dec 10 00:17:12 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 34BA34B5E41 for ; Thu, 10 Dec 2020 00:17:12 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from thebighonker.lerctr.org (ns-b.lerctr.org [IPv6:2001:470:1f0f:3ad::53:2]) (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 (2048 bits) client-digest SHA256) (Client CN "*.lerctr.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CrvcR6gnjz4clh for ; Thu, 10 Dec 2020 00:17:11 +0000 (UTC) (envelope-from jgh@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org; s=ler2019; h=Content-Type:Message-ID:Reply-To:Subject:To:From:Date: MIME-Version:Sender:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=eEPNhWAfY9l4aKaTP2kl3wXWjRw59S3GEtBENI8a8vE=; b=OGF12+sZ+JnJGMTADwSUo2/kzH 4ZHdXociGBXL8Zdh0CUmI9tFK8SXSu5M6tfVl/fYGAxQzvYTYYkGDGdLdJGzp0r7TwWImv4NnRNBA gI5S4Hr8Tl/gVD0KG5O/RRKm/jc4ms4Dlg7M9wqkFc0Ojd4sQ2h6qLc/ejLlGdbO5HUMRqjPZOZkR Q2dTvEz1uIdVmSN9R2vk8SrnVon6qPC9K3Dmsf2maWhXYoihEDBMDVYHMhjU1Xh5SpqygW08dpmo3 XlojXN5voWyaMUZrpPWDIed6DRM16UXvZ1xm7/ozBJWaTLE+6prgtlw+7Ek00sLLSGwI+creSCADv cE4bdeYg==; Received-SPF: softfail (thebighonker.lerctr.org: transitioning domain of FreeBSD.org does not designate 2001:470:1f0f:3ad:bb:dcff:fe50:d900 as permitted sender) client-ip=2001:470:1f0f:3ad:bb:dcff:fe50:d900; envelope-from=jgh@FreeBSD.org; helo=webmail.lerctr.org; Received: from thebighonker.lerctr.org ([2001:470:1f0f:3ad:bb:dcff:fe50:d900]:42068 helo=webmail.lerctr.org) by thebighonker.lerctr.org with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kn9du-000PBQ-Hh for freebsd-git@freebsd.org; Wed, 09 Dec 2020 18:17:10 -0600 Received: from 2600:6c52:7d7f:987b:7c9e:585b:9be:eb12 by webmail.lerctr.org with HTTP (HTTP/1.1 POST); Wed, 09 Dec 2020 18:17:08 -0600 MIME-Version: 1.0 Date: Wed, 09 Dec 2020 16:17:08 -0800 From: jgh@FreeBSD.org To: freebsd-git@freebsd.org Subject: question regarding git branches Reply-To: jgh@FreeBSD.org User-Agent: Roundcube Webmail/1.4.8 Message-ID: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> X-Sender: jgh@FreeBSD.org Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=_de7758b0ab1c52300fd4400308159e4d"; micalg=pgp-sha256 X-Rspamd-Queue-Id: 4CrvcR6gnjz4clh X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 00:17:12 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_de7758b0ab1c52300fd4400308159e4d Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Hi, I am a little late to the dance with git in respect to FreeBSD (haven't been following as much as I would like to given availability), but have been using it for awhile now at work and personally. With the recent migration from svn to git for documentation I saw that there was only one branch named "main." I think this is great that we also went with this name. My question more so is around workflow. Typically, it is seen as good practice to commit to a new branch and then merge to the main branch. Is this something that is being done as part of the commit process, or are commits being done straight to main branch? I'm not sure I need to go into the reasoning of having multiple branches and what that can do insofar as community and mentoring support, development CI/CD pipelines, etc. If this conversation goes down this path, though, I would be more than happy to discuss along with others. Thanks in advance! -jgh --=_de7758b0ab1c52300fd4400308159e4d Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=488 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEjg3EV5oPyRwj8wRUIFmaY0FQ09wFAl/RaQYACgkQIFmaY0FQ 09wKFAgAllTCbrJA07o7bvEZFpsUUUryheFWANQN6ghaficQ+RsSK9aIGidKzg7b bABtBgdf1MThzkAVQwMjrTeCPoT/pZY8VjFaESO8vPYnUa1DokwQaFTxSOqCNHj+ cihOGkLpwR3Yf76HhfRGgj3mK5khO+eAAxTQOROHsemGKOczjgTrLpcvCHYOQMY2 ZgAugqHRsa4TcmH1y2AuuDRDS84it9I7zbbcV1Wpjx9ITiFBOtpMPpSseXW7y+YZ nS0B7vbD0dJ26nJsqzAeu4CYX38RcYd5XEb8V56rkpvDGdByP5QS6cwq0Eb3aiSr 6sCuKzUqiF7D8dnFpL5fkODX9VGVew== =Qq23 -----END PGP SIGNATURE----- --=_de7758b0ab1c52300fd4400308159e4d-- From owner-freebsd-git@freebsd.org Thu Dec 10 00:38:12 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D21094B6C45 for ; Thu, 10 Dec 2020 00:38:12 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Crw4h1Byqz4f13; Thu, 10 Dec 2020 00:38:12 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-ot1-f49.google.com with SMTP id b18so3310383ots.0; Wed, 09 Dec 2020 16:38:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=QptWGQXusko3XeGHeYvlVUmeXf/wvhN1u9qWp2syl8Y=; b=KOflnaF1RBdV/xhcrxP39r3HKhzqTZVMAWaLKRvmpCydRFYnULdz2JTqk6cmWVbNOd OEEgQtqArY55J+AtmpDg7olezfrXgLrwbcknpggQdtw2uTWVDkuKMKaTfMxHvA5YX6Fl Lzl8qPPSHpZPsiHWQehIkn5S4A8jOwp7MZpISTBgct+yPfxjDQstu0OKqIqKfAy2pRCY g43BsdRkrcHfHpMWWicRjQlWfMS7o7568i96ZOukEwJ7/xDhW58A2vfZyPUpifK/du8E DF+bAKT7+veXhI/kM5mondP6vkDh3iM2ASlshAEbVJpXGrScygYVrOiKu3/ROYJLQJxV tEQw== X-Gm-Message-State: AOAM532IBsqUk9cfFSic4zagJW5B+n2tEc1PFYu78RJKkjNxqMwR97tK UgcUVQbDJ11WjENIrLHl9+ErS9NE/mE= X-Google-Smtp-Source: ABdhPJzx4564Dh2hHDijfBh/64gvhmC6PqA6JcRH3cmRmUwKpv7c/zVfK6DHFmCCGq7jpRTTvLYApw== X-Received: by 2002:a05:6830:3154:: with SMTP id c20mr4250387ots.286.1607560690922; Wed, 09 Dec 2020 16:38:10 -0800 (PST) Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com. [209.85.167.175]) by smtp.gmail.com with ESMTPSA id l21sm793967otd.0.2020.12.09.16.38.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Dec 2020 16:38:10 -0800 (PST) Received: by mail-oi1-f175.google.com with SMTP id 15so3832210oix.8; Wed, 09 Dec 2020 16:38:10 -0800 (PST) X-Received: by 2002:aca:383:: with SMTP id 125mr3690339oid.122.1607560690449; Wed, 09 Dec 2020 16:38:10 -0800 (PST) MIME-Version: 1.0 References: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> In-Reply-To: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> Reply-To: cem@freebsd.org From: Conrad Meyer Date: Wed, 9 Dec 2020 16:37:59 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: question regarding git branches To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Crw4h1Byqz4f13 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of csecem@gmail.com designates 209.85.210.49 as permitted sender) smtp.mailfrom=csecem@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; HAS_REPLYTO(0.00)[cem@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[209.85.210.49:from]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; REPLYTO_ADDR_EQ_FROM(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_SHORT(-1.00)[-0.999]; RCPT_COUNT_TWO(0.00)[2]; FORGED_SENDER(0.30)[cem@freebsd.org,csecem@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.210.49:from]; R_DKIM_NA(0.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_NEQ_ENVFROM(0.00)[cem@freebsd.org,csecem@gmail.com]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.210.49:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.49:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 00:38:12 -0000 Hi Jason, I believe the plan at this time is to use a single branch, rebase&push workflow initially. This is basically the same model as our Subversion workflow, so it is more of a 1:1 transition. Afterwards, we might transition to a PR+merge model. I think the long-term workflow is still undecided. This is just my best understanding and someone on the Git team probably knows better. Best regards, Conrad On Wed, Dec 9, 2020 at 4:17 PM wrote: > > Hi, > > I am a little late to the dance with git in respect to FreeBSD (haven't > been following as much as I would like to given availability), but have > been using it for awhile now at work and personally. With the recent > migration from svn to git for documentation I saw that there was only > one branch named "main." I think this is great that we also went with > this name. > > My question more so is around workflow. Typically, it is seen as good > practice to commit to a new branch and then merge to the main branch. Is > this something that is being done as part of the commit process, or are > commits being done straight to main branch? > > I'm not sure I need to go into the reasoning of having multiple branches > and what that can do insofar as community and mentoring support, > development CI/CD pipelines, etc. If this conversation goes down this > path, though, I would be more than happy to discuss along with others. > > Thanks in advance! > -jgh From owner-freebsd-git@freebsd.org Thu Dec 10 02:17:22 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DE1124719E1 for ; Thu, 10 Dec 2020 02:17:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CryH56TCtz4m7v for ; Thu, 10 Dec 2020 02:17:21 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72a.google.com with SMTP id z11so3487203qkj.7 for ; Wed, 09 Dec 2020 18:17:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=jO18iU5emyOMSDz6FW6CFoSS+Lxt40RmGdIlX6MeUfM=; b=XpCgFZ2If+w+QNbpPOAUK0296nvf7o5HgHBdMlslJWjZmpw3RLtn5PK02SshHsl1+e LTsisowPsaWkllHzZqeTGL6teZToTVLf56hWNRJbkpO3hYQRAPEOZhbRFnAeFuDX97lE b6Nz7FWD6XpFgDbu/QqD8rAMUKGVYt307vuhihcakSkBpeeiS59nOzzyPKZR8z6VeEni CKYA5hPYX+khXFsIMmsXB4gKDzCtqnjXZdNZYJa6dBM1bbeX8c4qIdf1GI5keMZHV/44 ri3+TeUPSDZmCM33rQshhrB2frftbMSbni2+wEvJAHAoTBNZlHiZ/g9rJWRqvCh6Uc/Y 1dpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=jO18iU5emyOMSDz6FW6CFoSS+Lxt40RmGdIlX6MeUfM=; b=dL84krmzQwIRA5Sf7ZWvDIqNPapxOR4Hoa3LyjzNfRzg+XVpfNSAeZo2+TwbZriwpq pxbJtKZtRFEUcpiEg/BgeaNTiS5jquKRCdiDG13o8KHloUBn7DFep6eugOMLZHQHDidV fQYyqwrU+DXL30Zd3Jb1UAjn1D1i6gu1MQXRXliN6C4aX8ZY5MtojWDKgd/t05jtx6sg xCcLCYUb7rMlRyoJrawdbzaUU0lG3IyE+u8ecs9K+0YQQQlYgI/Q6rh7SluenYKcn9ah CjszGbrcr2b1gqBdx4CtVPUiBZvXhydCJwtYHk4AKWInQw5PTCGl/27hEoAMbuGgWOQ/ SXpg== X-Gm-Message-State: AOAM532tuXs4iFO8Jr/V+1wK8ullcumdGTCxQraIKfC4bPIpvka74A8e wXqHs9Hp0TqpZw7pluKrhM9pD7oxXBo113nIvWG1l3oop8xFGA== X-Google-Smtp-Source: ABdhPJzPv5On8L9zSQQiaYzTmQ17ftr0U+jq0sA6GKYAXNlK/NqXdgRVB74mPy8MyOmIckehIxwWUBGDmPfd91HVyLo= X-Received: by 2002:a05:620a:2199:: with SMTP id g25mr6305141qka.89.1607566640718; Wed, 09 Dec 2020 18:17:20 -0800 (PST) MIME-Version: 1.0 References: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Wed, 9 Dec 2020 19:17:09 -0700 Message-ID: Subject: Re: question regarding git branches To: "Conrad E. Meyer" Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4CryH56TCtz4m7v X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=XpCgFZ2I; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72a) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72a:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72a:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72a:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 02:17:22 -0000 On Wed, Dec 9, 2020 at 5:38 PM Conrad Meyer wrote: > Hi Jason, > > I believe the plan at this time is to use a single branch, rebase&push > workflow initially. This is basically the same model as our > Subversion workflow, so it is more of a 1:1 transition. Afterwards, > we might transition to a PR+merge model. I think the long-term > workflow is still undecided. > > This is just my best understanding and someone on the Git team > probably knows better. > This is right. Long term, we'll almost certainly retain a linear history, but offer ways to send pull requests that are rebased and committed. Phase 1 is all about a great leap sideways from svn to git. Phase 2 and beyond can then be done more iteratively (with perhaps lots of experimentation). Warner > Best regards, > Conrad > > On Wed, Dec 9, 2020 at 4:17 PM wrote: > > > > Hi, > > > > I am a little late to the dance with git in respect to FreeBSD (haven't > > been following as much as I would like to given availability), but have > > been using it for awhile now at work and personally. With the recent > > migration from svn to git for documentation I saw that there was only > > one branch named "main." I think this is great that we also went with > > this name. > > > > My question more so is around workflow. Typically, it is seen as good > > practice to commit to a new branch and then merge to the main branch. Is > > this something that is being done as part of the commit process, or are > > commits being done straight to main branch? > > > > I'm not sure I need to go into the reasoning of having multiple branches > > and what that can do insofar as community and mentoring support, > > development CI/CD pipelines, etc. If this conversation goes down this > > path, though, I would be more than happy to discuss along with others. > > > > Thanks in advance! > > -jgh > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Thu Dec 10 06:14:23 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 39E29476708 for ; Thu, 10 Dec 2020 06:14:23 +0000 (UTC) (envelope-from ygy@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cs3Xb0Xqjz3FWY; Thu, 10 Dec 2020 06:14:23 +0000 (UTC) (envelope-from ygy@freebsd.org) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: ygy) by smtp.freebsd.org (Postfix) with ESMTPSA id F05052443; Thu, 10 Dec 2020 06:14:22 +0000 (UTC) (envelope-from ygy@freebsd.org) Received: by mail-lj1-f175.google.com with SMTP id e7so5366954ljg.10; Wed, 09 Dec 2020 22:14:22 -0800 (PST) X-Gm-Message-State: AOAM5311Cf2UeCu6K5jCWLWFRLUtztrjw+TLpDpLrm5SVsHDSLAsGFVZ pRDOPFOeUrhVxbCMZJxIKRCemoLbz+Z6kPnO9IU= X-Google-Smtp-Source: ABdhPJzVV/69wE77DPbikHf32/irPRrhPVBtbIkgvAptNrb34eXhAz4yryJa+SLil/25EKowzw46y7R+p69FtxGA6M0= X-Received: by 2002:a2e:5011:: with SMTP id e17mr2500048ljb.430.1607580861421; Wed, 09 Dec 2020 22:14:21 -0800 (PST) MIME-Version: 1.0 References: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> In-Reply-To: <24571d35d243bfd67dbefcbac61f8c7e@FreeBSD.org> From: Guangyuan Yang Date: Thu, 10 Dec 2020 14:14:09 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: question regarding git branches To: jgh@freebsd.org Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 06:14:23 -0000 =E4=BA=8E2020=E5=B9=B412=E6=9C=8810=E6=97=A5=E5=91=A8=E5= =9B=9B =E4=B8=8A=E5=8D=888:17=E5=86=99=E9=81=93=EF=BC=9A > > My question more so is around workflow. Typically, it is seen as good > practice to commit to a new branch and then merge to the main branch. Is > this something that is being done as part of the commit process, or are > commits being done straight to main branch? > > I'm not sure I need to go into the reasoning of having multiple branches > and what that can do insofar as community and mentoring support, > development CI/CD pipelines, etc. If this conversation goes down this > path, though, I would be more than happy to discuss along with others. > I'm not on the Git team, but just wanted to share my planned workflow: Start by setting the FreeBSD Git remote as upstream, and my Github repo [1] as origin: $ git remote -v origin git@github.com:yzgyyang/freebsd-doc.git (fetch) origin git@github.com:yzgyyang/freebsd-doc.git (push) upstream git@gitrepo.FreeBSD.org:doc.git (fetch) upstream git@gitrepo.FreeBSD.org:doc.git (push) And then the workflow for commits will be: develop on origin/dev, (open a pull request for reviews/CI), rebase merge to origin/main, then push to upstream/main. This way, one would still be able to work on multiple branches and do some collaborations and testing (just not on the project level), and enjoy some of the CI features. For example [2], I linked the repo to my personal Jenkins instance, so all Pull Requests will be tested. For sure that enabling branch & merge operations will open up a lot of new possibilities, but so far, this Git transition already helps me heavily with the dev workflow. [1]: https://github.com/yzgyyang/freebsd-doc [2]: https://github.com/yzgyyang/freebsd-doc/pull/6 Best, --=20 Guangyuan Yang ygy@FreeBSD.org From owner-freebsd-git@freebsd.org Thu Dec 10 14:46:20 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 482DE4AD3FE for ; Thu, 10 Dec 2020 14:46:20 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsGvH1xspz4Y1b for ; Thu, 10 Dec 2020 14:46:18 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id nNCxkRWnGtdldnNCyk3pbo; Thu, 10 Dec 2020 07:46:17 -0700 X-Authority-Analysis: v=2.4 cv=INe8tijG c=1 sm=1 tr=0 ts=5fd234b9 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=zTNgK-yGK50A:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=Ns2nXI7ay30Mr7WCL-QA:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 50DE9DA7 for ; Thu, 10 Dec 2020 06:46:14 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 0BAEkEXj008848 for ; Thu, 10 Dec 2020 06:46:14 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202012101446.0BAEkEXj008848@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: freebsd-git@freebsd.org Subject: svn-doc --> git-doc Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 10 Dec 2020 06:46:14 -0800 X-CMAE-Envelope: MS4xfMdi9qJRQjQB99laL71PROfqSNzCg/RBehPYaago0+cwT54BGnYEH1F/xO3b/UKasNZ4MKUmsLd14YYPOtTUkOFRlnvdGGY2cJJ4pIl3e0Mxw5t7p4Tm BF1i5zIARGegOsgzBsSA2BaUAY0hjxaYyAUpZVjuIe2mpKOeRV7r3LYJJ5i/AUsEabvZd9UGY9Z7ilLVSn8hWu3qP+gby1It8o4= X-Rspamd-Queue-Id: 4CsGvH1xspz4Y1b X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.9) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-1.70 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.134.9:from]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.229.168:received]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.59.134.9:from]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[64.59.134.9:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.134.9:from]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 14:46:20 -0000 Now that the svn-doc mailing list is inactive is there a new git-doc mailing list for git-doc commit messages? I can't find anything in the handbook. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Thu Dec 10 15:37:31 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DDED64AEC3C for ; Thu, 10 Dec 2020 15:37:31 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (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 "mail.bsd4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsJ2M0q2bz4c7q for ; Thu, 10 Dec 2020 15:37:30 +0000 (UTC) (envelope-from herbert@gojira.at) Date: Thu, 10 Dec 2020 16:37:29 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1607614649; bh=aw4fPZ7DJkCg+/fZhI/2WYuy1Sg5R3ENQe7goWqCubQ=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=pxOV9pDFay4FC6dyjMbYOkcdHh8nqCOUNEk7dxqNiNH48bpbx2vbY6qREUi6K5uAR FoZUPX2MrkH7zu59TN94pzQv4gIBAG4Lz+KD59epGcUxwyKCQNmCF1JuoakHT88mX+ AHnCsr2ajf/F/8GFRc3jDF99vDMVPuxigHU+Rcx9DRAUSCoUKhfYTBICcOlT0Uk3YV bBBPT6DYbArk7nqvbGa19Q1r7khOywkUzTAN3C3y2OeJYE08jn9hlZTf49hMJab3At E5iKbb7racuLhti4loMWNbH2geQ5It6VAzr8pEqOC46j9C5difsUEKYK1bwn1lhYIH 2KUsf6ZQPbvsw== From: "Herbert J. Skuhra" To: Cy Schubert Cc: freebsd-git@freebsd.org Subject: Re: svn-doc --> git-doc Message-ID: References: <202012101446.0BAEkEXj008848@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202012101446.0BAEkEXj008848@slippy.cwsent.com> X-Rspamd-Queue-Id: 4CsJ2M0q2bz4c7q X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=mail202005 header.b=pxOV9pDF; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 94.130.200.20 as permitted sender) smtp.mailfrom=herbert@gojira.at X-Spamd-Result: default: False [-3.50 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gojira.at:s=mail202005]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:94.130.200.20]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[gojira.at]; SPAMHAUS_ZRD(0.00)[94.130.200.20:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[gojira.at:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[94.130.200.20:from]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 15:37:31 -0000 On Thu, Dec 10, 2020 at 06:46:14AM -0800, Cy Schubert wrote: > Now that the svn-doc mailing list is inactive is there a new git-doc > mailing list for git-doc commit messages? I can't find anything in the > handbook. https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all -- Herbert From owner-freebsd-git@freebsd.org Thu Dec 10 17:07:24 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 388624B0CA9 for ; Thu, 10 Dec 2020 17:07:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsL230R1wz4jDx for ; Thu, 10 Dec 2020 17:07:22 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id nPPSkSRcqtdldnPPTk4LIA; Thu, 10 Dec 2020 10:07:20 -0700 X-Authority-Analysis: v=2.4 cv=INe8tijG c=1 sm=1 tr=0 ts=5fd255c9 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=zTNgK-yGK50A:10 a=S-1b6JwnAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=GOCsfFM_KvtDUmhZofAA:9 a=CjuIK1q_8ugA:10 a=jHPkhvgQCurpnRnmkKlz:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 8FC69EE0; Thu, 10 Dec 2020 09:07:17 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 0BAH7FnC009220; Thu, 10 Dec 2020 09:07:17 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202012101707.0BAH7FnC009220@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: "Herbert J. Skuhra" cc: Cy Schubert , freebsd-git@freebsd.org Subject: Re: svn-doc --> git-doc In-reply-to: References: <202012101446.0BAEkEXj008848@slippy.cwsent.com> Comments: In-reply-to "Herbert J. Skuhra" message dated "Thu, 10 Dec 2020 16:37:29 +0100." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 10 Dec 2020 09:07:15 -0800 X-CMAE-Envelope: MS4xfEzVwhSg4JoSq2O1eBAgo6FrvR3SUDRden+21k89ZwoQeIJgCKfFBb2U/UgcKMm/SSprApQrbPCiRVfxZGILsxs3IeEFE81ejBZChwMcY7ICwADMwUVt H9Mq3yls75YHDOsq9u1M/kJpUiyH8lWHu8WgCLk9z/y7DE6aOJeSeUtHrzFiS/ixBYbUW3i2j6xMEd6Q0PZ7p7EiB6soQ4lIZkqGSk2EeLJE7c771zZuOguX X-Rspamd-Queue-Id: 4CsL230R1wz4jDx X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.12) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-1.46 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.134.12:from]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_SHORT(-0.76)[-0.757]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.229.168:received]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.59.134.12:from]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[64.59.134.12:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.134.12:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 17:07:24 -0000 In message , "Herbert J. Skuhra" writes: > On Thu, Dec 10, 2020 at 06:46:14AM -0800, Cy Schubert wrote: > > Now that the svn-doc mailing list is inactive is there a new git-doc > > mailing list for git-doc commit messages? I can't find anything in the > > handbook. > > https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all Thank you. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Thu Dec 10 17:09:57 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB8814B0E5C for ; Thu, 10 Dec 2020 17:09:57 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from thebighonker.lerctr.org (ns-b.lerctr.org [IPv6:2001:470:1f0f:3ad::53:2]) (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 (2048 bits) client-digest SHA256) (Client CN "*.lerctr.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsL514kCwz4jWv for ; Thu, 10 Dec 2020 17:09:57 +0000 (UTC) (envelope-from jgh@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org; s=ler2019; h=Content-Type:Message-ID:References:In-Reply-To:Reply-To:Subject: Cc:To:From:Date:MIME-Version:Sender:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=PyFx8kNrjkrMr8+fSCpdO2EafRnGYIOHtZHC9nwBw3s=; b=J+fgjNW+o/4pH/YYo/OhNG4ary bsANd4nKIq44H/H9RLynxbtfrD6JUgp976uAiElJS01TUAEArU7j8Y6oWyg7kD3JDvON/4a6TBjle OTdkQGD4cLXBtYsgpoV4nH4NQCylnBMMWJflrlC2hrCSNzuNnw28VxZJC9185IfTTNjvWVOGxZon8 +sK1zcP3d1276co1Y9n9wamhT4CIi+YPuljT+Vh0NF3KQYBKI5lTrijwrUmUwOyUspdHMT9FcoO97 MM815eSTXebAfd95nXg+wtsy9jtCj23LKzhsHM5Ds+1n4vP2tgbbO/gvvoqwjmDEHRBg1FQ0A2Jfs a5mp7yuw==; Received-SPF: softfail (thebighonker.lerctr.org: transitioning domain of FreeBSD.org does not designate 2001:470:1f0f:3ad:bb:dcff:fe50:d900 as permitted sender) client-ip=2001:470:1f0f:3ad:bb:dcff:fe50:d900; envelope-from=jgh@FreeBSD.org; helo=webmail.lerctr.org; Received: from thebighonker.lerctr.org ([2001:470:1f0f:3ad:bb:dcff:fe50:d900]:55890 helo=webmail.lerctr.org) by thebighonker.lerctr.org with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94 (FreeBSD)) (envelope-from ) id 1knPRw-000F9R-G9; Thu, 10 Dec 2020 11:09:52 -0600 Received: from 2600:6c52:7d7f:987b:7111:fae9:6152:8509 by webmail.lerctr.org with HTTP (HTTP/1.1 POST); Thu, 10 Dec 2020 11:09:50 -0600 MIME-Version: 1.0 Date: Thu, 10 Dec 2020 09:09:50 -0800 From: jgh@FreeBSD.org To: "Herbert J. Skuhra" Cc: Cy Schubert , freebsd-git@freebsd.org Subject: Re: svn-doc --> git-doc Reply-To: jgh@FreeBSD.org In-Reply-To: References: <202012101446.0BAEkEXj008848@slippy.cwsent.com> User-Agent: Roundcube Webmail/1.4.8 Message-ID: X-Sender: jgh@FreeBSD.org Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=_a56301dec41137bc86d2b4c9850a6a69"; micalg=pgp-sha256 X-Rspamd-Queue-Id: 4CsL514kCwz4jWv X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 17:09:58 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_a56301dec41137bc86d2b4c9850a6a69 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2020-12-10 07:37, Herbert J. Skuhra wrote: > On Thu, Dec 10, 2020 at 06:46:14AM -0800, Cy Schubert wrote: >> Now that the svn-doc mailing list is inactive is there a new git-doc >> mailing list for git-doc commit messages? I can't find anything in the >> handbook. > > https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all I am in favor of this approach, and naming scheme, rather than using next flavor of version control software (even though git technically isn't vcs) explicitly named list (e.g., cvs-doc-all, svn-doc-all). Is this approach and shift being using across migration of subversion to git? -jgh --=_a56301dec41137bc86d2b4c9850a6a69 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=488 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEjg3EV5oPyRwj8wRUIFmaY0FQ09wFAl/SVmAACgkQIFmaY0FQ 09zqswf8Dpor35E8jeEqE1mnmioHwrmKD3ua9FCF8dPofpN9Gn+CGQBxPULK+R1+ 8Cke0+8S7qm4Ufa3skUuAVMPI/Hl5F2dwQ4JhKHPAzhVl+694XzNvOAy9NwSdNcu NXd+Hvckg6xlqgvnsnH8JFqhR+7jaMAuxkvyBu/NIlez7MC2R8S3pbw7/jjPcfa7 uiHdj+n0XWmIetOoo7VOsI1dS+wTPEM0N6xEES/E4OEQdUPjNCo0KKvl1sGKtkwB EpOc/ML8Td5Ct63zmb0ii9n1/DNaRQTEDmaz3JV9ddr4vm3D1QFGcR7N8vYxKtVT tPD0sLuyvNBhAtHQEcOeDoxs2ZtwQA== =GltG -----END PGP SIGNATURE----- --=_a56301dec41137bc86d2b4c9850a6a69-- From owner-freebsd-git@freebsd.org Thu Dec 10 17:33:02 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 88D6C4B12E1 for ; Thu, 10 Dec 2020 17:33:02 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsLbd4pzQz4kNP; Thu, 10 Dec 2020 17:33:01 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f41.google.com with SMTP id o8so6385201ioh.0; Thu, 10 Dec 2020 09:33:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7obmCkawox5vetH0rWQCJ9VQhD57jXrub+yCM7fYKyk=; b=PNIiKCgWufKcTZ7t0ln+lN05HCP0+vJblCjlweZRcMXpqozO92tqo5OXeu4DE0w22v BMkuH/urzaDSkbDclyOyWhZXfuAJClNvNwECKKHt4VuMuoiSTQGbGQ2FFkB+pwbSIeC/ nFIhIHjD0EhM5wiWwXS7/faGLh8dS2o0PEQOdbRE0CufyuHJ1mlN4E16y1v4Pgf0miSz cQbizYFvMPTndTwk+Z3hLyv5u/Z/N6aIt5s0y3SA6v0bYWo6W/lyZETX177KaHjgWlD3 126MUIsJL8J9Xt41tA9x2VrBSxRmxY7b+x+Np2FD0yt2WRikW1fu6CINBncXuVZwcyYt UakQ== X-Gm-Message-State: AOAM533it8qxK6cJsM0mXgp6uLOeHivRMRnjELJ4t8OxBvP4H7TA7jnE A+jyQlsBM83PqW2qGEL2ETB/qFgCElluj+JvC+bI7a51YNZFFA== X-Google-Smtp-Source: ABdhPJwx+Xa0DHioL0FprBOHjGwlqgixWfQ0S6APNxXon1PqbloWNIrwj7U0yVn0qlxZ9XwhoVq9aPIXkQYZr5gpE3g= X-Received: by 2002:a02:830f:: with SMTP id v15mr9992706jag.12.1607621579953; Thu, 10 Dec 2020 09:32:59 -0800 (PST) MIME-Version: 1.0 References: <202012101446.0BAEkEXj008848@slippy.cwsent.com> In-Reply-To: From: Ed Maste Date: Thu, 10 Dec 2020 12:32:47 -0500 Message-ID: Subject: Re: svn-doc --> git-doc To: Jason Helfman Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4CsLbd4pzQz4kNP X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.41 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-1.74 / 15.00]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.166.41:from]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_TLS_ALL(0.00)[]; SPAMHAUS_ZRD(0.00)[209.85.166.41:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.41:from]; NEURAL_SPAM_SHORT(0.26)[0.264]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.41:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 17:33:02 -0000 On Thu, 10 Dec 2020 at 12:10, wrote: > > > https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all > > I am in favor of this approach, and naming scheme, rather than using > next flavor of version control software (even though git technically > isn't vcs) explicitly named list (e.g., cvs-doc-all, svn-doc-all). Is > this approach and shift being using across migration of subversion to > git? Yes, the new commit mailing lists will not mention 'git'. The new lists are visible on https://lists.freebsd.org/mailman/listinfo: dev-commits-doc-all dev-commits-ports-all dev-commits-ports-branches dev-commits-ports-main dev-commits-src-all dev-commits-src-branches dev-commits-src-main There might be tweaks to the specific lists, and the format of commit mail, based on feedback. In particular src has a list for branch commits (e.g. stable/) but not separate stable-11, stable-12 lists but we could add those if there's demand. From owner-freebsd-git@freebsd.org Thu Dec 10 22:34:44 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 16CC24BB240 for ; Thu, 10 Dec 2020 22:34:44 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CsTHl73Y4z4RdD for ; Thu, 10 Dec 2020 22:34:43 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id F07A04BB3B9; Thu, 10 Dec 2020 22:34:43 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F03D84BB23F for ; Thu, 10 Dec 2020 22:34:43 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsTHl6WFDz4S0F for ; Thu, 10 Dec 2020 22:34:43 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1607639683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htdg5nzPX0BfJ2xzdxshB41hA1NUYtwdhIuBz+5qcHg=; b=EbBQ9HcXo/ZnQYrw2v06CDujP+X/7D28rVeThtsymQed8TG9+osakGC46ZfjCFYbBrnaGv v11ieg1dbHAfEFzyotrZ682MlXmP6ogbfO8Iyj6zqxViu3pNdhI03Ds+DhglojI3ofCFiN hJgXB/zx3yJZ9Pth0F3p2tGbabftdPjWTT5g2wSp4KmelVHDyYenU6pwJbs+4N8G5g7Rc9 y9nPsPbvwdl7yXfl/M74Zwb9uwPP26U0woffiiNbaqUxaIB/CUhZ27bgCQBXoq7LrI/Yx2 AY4VuOZxRtOlWVR58xy4zDxcFpAj6xD3verhzGVnzuf0CvvE20lQlTfEP+yuNQ== Received: by freefall.freebsd.org (Postfix, from userid 1185) id D887CDDB; Thu, 10 Dec 2020 22:34:43 +0000 (UTC) Date: Thu, 10 Dec 2020 22:34:43 +0000 From: Rene Ladan To: git@freebsd.org Subject: svnadmin equivalent? Message-ID: <20201210223443.GA64504@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1607639683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=htdg5nzPX0BfJ2xzdxshB41hA1NUYtwdhIuBz+5qcHg=; b=N7aZo5DqG6FdfsZ44dNzf+vjx98TMU++YzI14J2ChOwuiFlaL3UXlYu7MTOjxpAZtcYipe AhkoLO1sdatVKERzJyvV02N2zD2gFUSxwrWZ/vavVo8ZeC9YCWzh88caBReKTX4lb8DRX8 NY3j+SXc0GBFW4xGP/jb/4utkWrn8JDsNekINey8pmnptX3fdM7jAKnFMH0DFbBZHr0olt s7k/2e4QBegaAJnSe/iYKmQ2xUwD8682JXYe4S//MCrMOh6pncCpCVicSqpzOTli9nGR0g 4O/PfcjgJi0fy7SVLnxcniHLfzaqgGWcYVZJnlDdHSuGq6RqWAgGjNlLI/3GHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1607639683; a=rsa-sha256; cv=none; b=s4wU/dVAaRC9tDZU9XGrmEW2BdtW0JNvPxcBTaAEWjnMvL3Wq3aWOVraV8cAUNospmIZMz YQy+uvojjv/LHwDIQb995/7qJ/dVKBAs+kUogjjAG0CMCsmPJ7FTVPJVgQw5QRqWv3MP3C 7soaUMyu3lLRozxlxlZC50ZyfJU3ic8qJRRHMFmiFlhUcf8q2JWg2fEMDMg0cxsQJPZ5gB o/2khNB/3EVxjnZ5ZI//qmbAnfJ+KasBvvdxqTyRoKrS6VvdZFNBvR3yJtHIUbABz5bRcv vrRC3SVxspOThASGVN0CvVThl80/+Bgc+FIY8ZIA7IVmAvBukKW8iYPEB+W/xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 22:34:44 -0000 Hello, where did the equivalent of svnadmin end up for the doc repository now that it has been converted to git? I tend to use this with my Grim Reaper hat on to see if former ports committers are also active in doc or src, and for ports when they became ports committer for the Developer Alumni section in the Contributors Guide. Regards, Ren From owner-freebsd-git@freebsd.org Fri Dec 11 01:58:21 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1DC024BF302 for ; Fri, 11 Dec 2020 01:58:21 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CsYpj0H44z4cym for ; Fri, 11 Dec 2020 01:58:21 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 092F04BF128; Fri, 11 Dec 2020 01:58:21 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 08F604BEED3 for ; Fri, 11 Dec 2020 01:58:21 +0000 (UTC) (envelope-from lwhsu@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsYph6sNTz4d9l; Fri, 11 Dec 2020 01:58:20 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com [209.85.219.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id D8F53BA37; Fri, 11 Dec 2020 01:58:20 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f182.google.com with SMTP id v67so6666690ybi.1; Thu, 10 Dec 2020 17:58:20 -0800 (PST) X-Gm-Message-State: AOAM531yYqZjvW6OcsKRP/fDkxSdZMkkMjV2rRcRJbbfRDxGp8Somk/R lXfL0E20radzL/yjEk7JnItclpF+enSbScUGrD8= X-Google-Smtp-Source: ABdhPJx2ud0sxlGLig8DmX5wjixriBkq73tVg6Q9ieS4wK3f6htQjk/3VIi/Irt50HYtFGVN28IehGDDsD5IPdZ5bmQ= X-Received: by 2002:a25:bb8f:: with SMTP id y15mr16069688ybg.451.1607651900241; Thu, 10 Dec 2020 17:58:20 -0800 (PST) MIME-Version: 1.0 References: <20201210223443.GA64504@freefall.freebsd.org> In-Reply-To: <20201210223443.GA64504@freefall.freebsd.org> From: Li-Wen Hsu Date: Fri, 11 Dec 2020 09:58:08 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svnadmin equivalent? To: Rene Ladan Cc: git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 01:58:21 -0000 On Fri, Dec 11, 2020 at 6:34 AM Rene Ladan wrote: > where did the equivalent of svnadmin end up for the doc repository > now that it has been converted to git? Most of the content in svnadmin is not so useful in git, so only access and mentors files (including their history) are preserved in an "orphan branch" in git, internal/admin. Other config files like approvers will be converted to a new format to match the philosophy and the hooks under development. They will be added to the internal/admin branch when we open more workflows. > I tend to use this with my Grim Reaper hat on to see if former > ports committers are also active in doc or src, and for ports when > they became ports committer for the Developer Alumni section in the > Contributors Guide. Full information is available at https://github.com/freebsd/git_conv#gimme-the-repo Here is how I check out the internal/admin branch (to "admin" local branch): git config --add remote.origin.fetch '+refs/internal/*:refs/internal/*' git fetch git checkout -b admin internal/admin For browsing in cgit: https://cgit-dev.freebsd.org/doc/log/?h=internal/admin Best, Li-Wen From owner-freebsd-git@freebsd.org Fri Dec 11 03:57:00 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD186479EDA for ; Fri, 11 Dec 2020 03:57:00 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CscRc4nBhz4kpP for ; Fri, 11 Dec 2020 03:57:00 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id A1F19479ABE; Fri, 11 Dec 2020 03:57:00 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A090E479ABC for ; Fri, 11 Dec 2020 03:57:00 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CscRc2KvMz4kZj; Fri, 11 Dec 2020 03:57:00 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 0BB3upXw057503 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 11 Dec 2020 05:56:55 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 0BB3upXw057503 Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 0BB3upMl057502; Fri, 11 Dec 2020 05:56:51 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 11 Dec 2020 05:56:51 +0200 From: Konstantin Belousov To: Li-Wen Hsu Cc: Rene Ladan , git@freebsd.org Subject: Re: svnadmin equivalent? Message-ID: References: <20201210223443.GA64504@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 4CscRc2KvMz4kZj X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 03:57:00 -0000 On Fri, Dec 11, 2020 at 09:58:08AM +0800, Li-Wen Hsu wrote: > git config --add remote.origin.fetch '+refs/internal/*:refs/internal/*' TIL. Is there a list of all things not cloned? In other words, how to fetch exact clone of the repo, with all notes, invisible branches, and other stuff we do not know about ? From owner-freebsd-git@freebsd.org Fri Dec 11 04:00:01 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9EB1C479D2C for ; Fri, 11 Dec 2020 04:00:01 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CscW541QMz4kwJ for ; Fri, 11 Dec 2020 04:00:01 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 881DF479F83; Fri, 11 Dec 2020 04:00:01 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 87E53479EE3 for ; Fri, 11 Dec 2020 04:00:01 +0000 (UTC) (envelope-from lwhsu@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CscW52yRWz4l3j; Fri, 11 Dec 2020 04:00:01 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com [209.85.219.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4FD84C8F0; Fri, 11 Dec 2020 04:00:01 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f173.google.com with SMTP id g15so6855793ybq.6; Thu, 10 Dec 2020 20:00:01 -0800 (PST) X-Gm-Message-State: AOAM533KpR82YUXsSdY0LV3+sNPclIR7mKlm+2Hea/0OCWUK2MXxD2WA lLqvroHOhJrvuvw9oUkZvMIejjRREynEu9h5Bc8= X-Google-Smtp-Source: ABdhPJyBkAhUUXC9iDyDLY+bonmYCAs2d0lAfZADFnn3huLYBFMLAzyMlFbZ3RxQChaW41afQx/1xRoFnvH6VvHS+ug= X-Received: by 2002:a25:4608:: with SMTP id t8mr16681647yba.497.1607659200909; Thu, 10 Dec 2020 20:00:00 -0800 (PST) MIME-Version: 1.0 References: <20201210223443.GA64504@freefall.freebsd.org> In-Reply-To: From: Li-Wen Hsu Date: Fri, 11 Dec 2020 11:59:49 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svnadmin equivalent? To: Konstantin Belousov Cc: Rene Ladan , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 04:00:01 -0000 On Fri, Dec 11, 2020 at 11:57 AM Konstantin Belousov wrote: > > On Fri, Dec 11, 2020 at 09:58:08AM +0800, Li-Wen Hsu wrote: > > git config --add remote.origin.fetch '+refs/internal/*:refs/internal/*' > > TIL. > > Is there a list of all things not cloned? In other words, how to fetch > exact clone of the repo, with all notes, invisible branches, and other > stuff we do not know about ? This link in the previous mail may help: > > Full information is available at > > https://github.com/freebsd/git_conv#gimme-the-repo Best. Li-Wen From owner-freebsd-git@freebsd.org Fri Dec 11 04:35:10 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4229A47A471 for ; Fri, 11 Dec 2020 04:35:10 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CsdHd735wz4mvs for ; Fri, 11 Dec 2020 04:35:09 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id F1EA847AA85; Fri, 11 Dec 2020 04:35:09 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F1B3647AA6C for ; Fri, 11 Dec 2020 04:35:09 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsdHd50Jvz4mnB; Fri, 11 Dec 2020 04:35:09 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 0BB4Z2t7065980 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 11 Dec 2020 06:35:05 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 0BB4Z2t7065980 Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 0BB4Z2PA065950; Fri, 11 Dec 2020 06:35:02 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 11 Dec 2020 06:35:02 +0200 From: Konstantin Belousov To: Li-Wen Hsu Cc: Rene Ladan , git@freebsd.org Subject: Re: svnadmin equivalent? Message-ID: References: <20201210223443.GA64504@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 4CsdHd50Jvz4mnB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 04:35:10 -0000 On Fri, Dec 11, 2020 at 11:59:49AM +0800, Li-Wen Hsu wrote: > On Fri, Dec 11, 2020 at 11:57 AM Konstantin Belousov > wrote: > > > > On Fri, Dec 11, 2020 at 09:58:08AM +0800, Li-Wen Hsu wrote: > > > git config --add remote.origin.fetch '+refs/internal/*:refs/internal/*' > > > > TIL. > > > > Is there a list of all things not cloned? In other words, how to fetch > > exact clone of the repo, with all notes, invisible branches, and other > > stuff we do not know about ? > > This link in the previous mail may help: > > > > Full information is available at > > > https://github.com/freebsd/git_conv#gimme-the-repo Can we have it scripted, per repo, and scripts available somewhere ? It is convoluted list of per-repo branches. I want a simple means to run something and get the guaranteed clone of all material from the repo. From owner-freebsd-git@freebsd.org Fri Dec 11 04:37:48 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AAEF347AB05 for ; Fri, 11 Dec 2020 04:37:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CsdLh3QNxz4n3g for ; Fri, 11 Dec 2020 04:37:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 7382E47AB04; Fri, 11 Dec 2020 04:37:48 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7224547AA8E for ; Fri, 11 Dec 2020 04:37:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsdLh2XkJz4mwD for ; Fri, 11 Dec 2020 04:37:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x732.google.com with SMTP id n142so7356430qkn.2 for ; Thu, 10 Dec 2020 20:37:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=cCCKjjT29Dtf61et4tHhGtq3x46O2+RYwX8Sy9ew0Xs=; b=OX7JbiH9CaIYiFEeeoMroN30pgRo+FBL2onbDfMV8eKWl3CeTxhDYFWmfGllldf+Xe X4Ba0vUQ0lAWP2DwB233TFePLqZVuSQGHQtM8Mo3cOyAVDrGyqAxKubUlmplZq6JfHjQ j1dMefoS1Lk1NIYgHvoPQag4sX8K+3yUEd7py6wLaPkdfN2sF9NP+i90MkUBm22GnRGc tcMFgU9eNWci0J9RmQbejgvVmJn1A5HeP6x71fv3GECKxJ8wwbaMO6t+o7tidJ9v1cB7 XZ/2K5G5HTISg6jnhGTWxYdKeN5oM062OHUVzBLvjTiUNWR1de2R1lPvKel5YkbFV7po gw8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=cCCKjjT29Dtf61et4tHhGtq3x46O2+RYwX8Sy9ew0Xs=; b=psgMHQfiPNno5tYfyysemL2XexT3xvhtZU123EuBJB9A38bT/aD5otP70+6Bl+bweu jO1eD91gfps5uczxV8Zu9PEhlfywWGN/iGNAZymTrkyzLjjzR5vnCIbMGw+KZ6fGDW42 4FNaUNvVw2oTCzWs9Q90JGulJ1CyfLKa/hPGd1gQ/ZJOwJ4T9qspOAjZdSGg2b7dIAlH PnDQEVAvY3CHnc+adGsn7UdfRAl82sTPReER2SpwA0sADlS23E9PYQfe/ptaT2igYhs1 S/7wwTXdf4F9q3tc0EDFZcWdMjcdgKzGX2EBiE1JOmLVhOT2QGTwuIe2FSNvm+C1md98 KofQ== X-Gm-Message-State: AOAM530Ka+aS1wWXXb2pTHlCvebAsrI+2uNGkjQJDT73Gs0an1wKZ3g8 gQzzan/nEZ7YJZdfyGX7cv94kzRxxauDB0jYJRmUtQ== X-Google-Smtp-Source: ABdhPJzmd+AJmC+jIHpTAUNyBUguXG2S97q3UCNB/cOXClQndWefAdKRrqoIzARivzH19joD8tQZMoB4XMhBLwyt21A= X-Received: by 2002:a37:a614:: with SMTP id p20mr13475889qke.359.1607661467047; Thu, 10 Dec 2020 20:37:47 -0800 (PST) MIME-Version: 1.0 References: <20201210223443.GA64504@freefall.freebsd.org> In-Reply-To: From: Warner Losh Date: Thu, 10 Dec 2020 21:37:35 -0700 Message-ID: Subject: Re: svnadmin equivalent? To: Konstantin Belousov Cc: Li-Wen Hsu , git@freebsd.org X-Rspamd-Queue-Id: 4CsdLh2XkJz4mwD X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 04:37:48 -0000 On Thu, Dec 10, 2020, 9:35 PM Konstantin Belousov wrote: > On Fri, Dec 11, 2020 at 11:59:49AM +0800, Li-Wen Hsu wrote: > > On Fri, Dec 11, 2020 at 11:57 AM Konstantin Belousov > > wrote: > > > > > > On Fri, Dec 11, 2020 at 09:58:08AM +0800, Li-Wen Hsu wrote: > > > > git config --add remote.origin.fetch > '+refs/internal/*:refs/internal/*' > > > > > > TIL. > > > > > > Is there a list of all things not cloned? In other words, how to fetch > > > exact clone of the repo, with all notes, invisible branches, and other > > > stuff we do not know about ? > > > > This link in the previous mail may help: > > > > > > Full information is available at > > > > https://github.com/freebsd/git_conv#gimme-the-repo > > Can we have it scripted, per repo, and scripts available somewhere ? > It is convoluted list of per-repo branches. I want a simple means to > run something and get the guaranteed clone of all material from the repo. > git clone --mirror Warner _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Fri Dec 11 11:30:55 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4BDDD4AC41C for ; Fri, 11 Dec 2020 11:30:55 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CspWM05wCz3hGG for ; Fri, 11 Dec 2020 11:30:55 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 018F94AC31F; Fri, 11 Dec 2020 11:30:55 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 014414AC49A for ; Fri, 11 Dec 2020 11:30:55 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CspWL4pRHz3h3R for ; Fri, 11 Dec 2020 11:30:54 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 0BBBUjr3064531; Fri, 11 Dec 2020 11:30:45 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 0BBBUjgA064530; Fri, 11 Dec 2020 03:30:45 -0800 (PST) (envelope-from david) Date: Fri, 11 Dec 2020 03:30:45 -0800 From: David Wolfskill To: Warner Losh Cc: Konstantin Belousov , git@freebsd.org Subject: Re: svnadmin equivalent? Message-ID: References: <20201210223443.GA64504@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="NL0vzyxaeU/t9/Yt" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4CspWL4pRHz3h3R X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 11:30:55 -0000 --NL0vzyxaeU/t9/Yt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 10, 2020 at 09:37:35PM -0700, Warner Losh wrote: > On Thu, Dec 10, 2020, 9:35 PM Konstantin Belousov > wrote: > ... > > Can we have it scripted, per repo, and scripts available somewhere ? > > It is convoluted list of per-repo branches. I want a simple means to > > run something and get the guaranteed clone of all material from the rep= o. > > >=20 > git clone --mirror >=20 > Warner > .... FWIW, that is what I have been doing. Peace, david --=20 David H. Wolfskill david@catwhisker.org Ref. Jacobson v Massachusetts, 1905: SCOTUS found that the rights of the individual do not trump the need to ensure public safety. Wear a mask! See http://www.catwhisker.org/~david/publickey.gpg for my public key. --NL0vzyxaeU/t9/Yt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/TWGVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PclpVwgA0gddolucwoI1YWL7CHZoUhc8bvFLYMdTAJ3lkb5uLDrFy/lr3uyfYh+B SWJU52vmlFQpyzsZoaLUjp+1hJKY3VBQx8t0dGjjfkqlp66vi60AxTzeeVnRy7gg WAqXmRtiL8bkl7X6dewcsde2AnYJSfVum7EW30xnGyZcx1Vev14hayNhsB8IoUfv f8Qp3B4gGEtzzg9StnzcfgBfwV2o7zYVOiMV4/VoqVJ1RWfo+b5DskFQGGDu0VkV 3HACt7z/s/q6dV9GU3wvvDm0nXZv7z1/nzT0B/aUs4rcFEMbsNoPPSNxVqeDzQCh OQpUeqqjxTdGSjzc0N1/xRAfzvyAWw== =iyfo -----END PGP SIGNATURE----- --NL0vzyxaeU/t9/Yt-- From owner-freebsd-git@freebsd.org Fri Dec 11 13:38:22 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1DDE44B033C for ; Fri, 11 Dec 2020 13:38:22 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CssLQ0C04z3rSb for ; Fri, 11 Dec 2020 13:38:22 +0000 (UTC) (envelope-from mat@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 0219D4B0609; Fri, 11 Dec 2020 13:38:22 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 01E0A4B016D for ; Fri, 11 Dec 2020 13:38:22 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CssLP6PPDz3rdb for ; Fri, 11 Dec 2020 13:38:21 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [IPv6:2a01:678:4:1::228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id B522D205E2 for ; Fri, 11 Dec 2020 13:38:21 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:ab:50:716:1ded:630c:7c39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id F32AF942D86 for ; Fri, 11 Dec 2020 13:38:18 +0000 (UTC) Date: Fri, 11 Dec 2020 14:38:17 +0100 From: Mathieu Arnold To: git@freebsd.org Subject: Re: svnadmin equivalent? Message-ID: <20201211133817.c546xhwcl4uhcdis@aching.in.mat.cc> References: <20201210223443.GA64504@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="toiptaptqs35sze4" Content-Disposition: inline In-Reply-To: X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 13:38:22 -0000 --toiptaptqs35sze4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 11, 2020 at 03:30:45AM -0800, David Wolfskill wrote: > On Thu, Dec 10, 2020 at 09:37:35PM -0700, Warner Losh wrote: > > On Thu, Dec 10, 2020, 9:35 PM Konstantin Belousov > > wrote: > > ... > > > Can we have it scripted, per repo, and scripts available somewhere ? > > > It is convoluted list of per-repo branches. I want a simple means to > > > run something and get the guaranteed clone of all material from the r= epo. > > > > >=20 > > git clone --mirror > >=20 > > Warner > > .... >=20 > FWIW, that is what I have been doing. So, something like: $ git clone --mirror git@repo-dev.freebsd.org:ports.git ports.git $ cd ports.git $ git worktree add ../ports main $ git worktree add ../quarterly branches/2020Q4 $ cd ../ports and then work from there, that will do. --=20 Mathieu Arnold --toiptaptqs35sze4 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAl/TdkVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgJi3RAArO7PVdlLo+MpfZWVBLQkKj9InlCrbNzXojVMUMXESepgEmPmUFxF0u/E LS94c5No8z4JkBmG1z1fGVlR45Kc+iYIL+GCLzi+bGNrgGo59J4qCCYuYlDBMP7S 9LklQi7ycUJzAsK3vSUs+wfjs5OJJdJAw9ZCnBky6WetLScwTjKjCZoXSqaHIqzU QfZantr9xq6VxBERnyLEeA8ukPG5j8exaetW/SV0pV+Ae9JVrPdBZWGmaPGbbDOx s7nFr/SbxzZmpecLUrjdzTB3860oFYytO3okRBpbxkY7v79SyG27Z7ZYfvJTsIgX 22tJIn/+FlTU3LIgv9ZUIqt4Vin5tanYmuxfeMw1LjykC2MpCbWy9OKIORsyWqQX v48a6eNW+0SN+7LE3pAl6NcumifUVapKXHxUr5aZRQGBIzAflubhHrPst3h5Ee/2 K+z87RC9bSr9K9Vg31Ve4OgFxJ97BJDObBVmdJkIqgmG6VQyNmDiWffY4WZFhJJW Y94Im0mUqccYNShWngKw+9C7zLXoDABw7gRtaMIOXlkazpsA6BDCn0+6wIV7Bdtn lQTN+EdQ7HM3nbnTjTyxQl1HW4DWlTeYl4J42V/YQN2RVs80PYX6mL2X4wogKV6p YqlpZeKMUivm3GZKisXKTtkflQfNiTrNXmALJDQi8vfokon6KjI= =ZabP -----END PGP SIGNATURE----- --toiptaptqs35sze4-- From owner-freebsd-git@freebsd.org Fri Dec 11 15:49:08 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D55254B30E4 for ; Fri, 11 Dec 2020 15:49:08 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CswFJ4YNcz4WHy for ; Fri, 11 Dec 2020 15:49:08 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 9A3424B30E3; Fri, 11 Dec 2020 15:49:08 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 99F3F4B3184 for ; Fri, 11 Dec 2020 15:49:08 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CswFJ3kbCz4WS0 for ; Fri, 11 Dec 2020 15:49:08 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: by mail-qk1-x730.google.com with SMTP id q22so8797857qkq.6 for ; Fri, 11 Dec 2020 07:49:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=94/j7mCAvbG4NFrh0GQ/aw88Z0tawM1kbOBNi5+ft5A=; b=ACSml6FQXbkWKXdgKOpu76NXqHnu4ef2Jr0buA3f9/uckQmspiR40LLjic/kBcypnV BjRSNVm5Ow+p8POmHprosa40Erl8dAvd7l44GuIGoVXcp6xkIAwODiFA0iGl3PAOWViE xFr2z7s3s8OBnRSHnjiOi6tF9E0PMOUYBysQELkCEfnu/bp45QonDEFsHklksR7hYxGm ZDEERosrN2AcEdz72JnkkYg2nHUSCw7AtUseI4RgiNs5O1WHZXmwDH2hPw4wBqHCZZkI QYQTxoumcB3MlqTQr6vQBGsCsRsGTX6ctoVJEYVwg2r2zLisii4ms0mxpAiYPDS0Dh4T i0eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=94/j7mCAvbG4NFrh0GQ/aw88Z0tawM1kbOBNi5+ft5A=; b=ajitrkHDGK+EyAMTEhfRH6CDSKqOdyTlTpF55mgEqBHeRGiqqdHmeoTX5QCjfA3OxG 1lnS1XIbHvY5AyiVbDobDFjkj0mhkeovkUy0P+7VGB+dhsZAg6QeowMjTIE03RJiv6sW +LIYIyUnm2GCzLmfrfmGGLXPlFPfjhBqREinb/MsuFrsdt72l2dOEyfbgzrjknHmP37Z exwbDnt2LF7HejUYGZcu8MtUE7ETjnaXKe4JB6jryfAqvxztSgI9verTeTeOTgDBj9/Q vaBezuacIEhJJdi1qopdTa83XFI17OT7idrClmBybcN61IUHGBquf+5S4Arr7YJA7LkS Bguw== X-Gm-Message-State: AOAM531OceaPHOk2kgaKkOAWIImSyE0P+XOIkkNqjI+gtJefuh8If0rF NdR+xnEg7qSdCCH2195xxow= X-Google-Smtp-Source: ABdhPJwnk1I5wBVjMSFADMZtlN52JjcGXaPAucLkdpOZtGMppjpY0hJNEReCjHo2OH0fBesxY/xWFA== X-Received: by 2002:a05:620a:6a1:: with SMTP id i1mr17092784qkh.136.1607701747687; Fri, 11 Dec 2020 07:49:07 -0800 (PST) Received: from [192.168.222.18] (192-222-183-158.qc.cable.ebox.net. [192.222.183.158]) by smtp.gmail.com with ESMTPSA id n81sm7028835qka.76.2020.12.11.07.49.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Dec 2020 07:49:06 -0800 (PST) Subject: Re: svnadmin equivalent? To: Warner Losh , Konstantin Belousov Cc: git@freebsd.org References: <20201210223443.GA64504@freefall.freebsd.org> From: Marc Branchaud Message-ID: <8e48e2ea-59d8-d2fd-4e25-e12088ff3a36@gmail.com> Date: Fri, 11 Dec 2020 10:49:05 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4CswFJ3kbCz4WS0 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 15:49:08 -0000 On 2020-12-10 11:37 p.m., Warner Losh wrote: > On Thu, Dec 10, 2020, 9:35 PM Konstantin Belousov > wrote: >> >> Can we have it scripted, per repo, and scripts available somewhere ? >> It is convoluted list of per-repo branches. I want a simple means to >> run something and get the guaranteed clone of all material from the repo. >> > > git clone --mirror "git clone --mirror" fetches everything, but it has two potentially confusing side-effects: * Mirroring creates a "bare" local repository without any checked-out files (all you get are the contents of the remote's .git/ directory). This doesn't mean it's unusable, just that it's not *directly* usable (for example, see Mathieu's suggestion about "git worktree add"). * More subtly, mirroring also removes the distinction between your local branches and the remote repo's branches. So you don't end up with any "origin/XXXX" branches. This can be very confusing when you've made commits to your local "main" branch that get clobbered by your next fetch. Here's how to get absolutely everything in your regular-clone'd repo while preserving the "origin/" namespace for the official repo's branches: # First reset the config to the default that a non-mirror clone creates: git config --replace-all remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' (WARNING: If you've configured other remote.origin.fetch specs, like to retrieve the "notes" namespace, this command will remove those and you'll have to re-configure them.) # Then configure fetch to also get all the other stuff: git config --add remote.origin.fetch '+refs/*:refs/origin/*' The default setting is important to make commands that interpret branch names work properly with remote ("origin/") branches, because they look for remote branch names under the refs/remotes/ namespace. The second setting puts *every* reference in the remote repo into your repo's "refs/origin/" namespace. Since nothing in git uses the "refs/origin/" namespace we're free to do whatever we want with it without breaking anything. The slight inconvenience is that to access a non-branch, non-tag symbol we have to prefix it with "refs/origin/" (not just "origin/"): git show refs/origin/internal/admin:mentors git log refs/origin/vendor/zlib/1.2.10 git checkout -b my-arm64-hacks refs/origin/projects/arm64 M. From owner-freebsd-git@freebsd.org Fri Dec 11 16:32:47 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CEBE14B4511 for ; Fri, 11 Dec 2020 16:32:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CsxCg3jzqz4ZMp for ; Fri, 11 Dec 2020 16:32:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 7DCA04B4510; Fri, 11 Dec 2020 16:32:47 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7D80A4B43BD for ; Fri, 11 Dec 2020 16:32:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CsxCg28Lpz4Zcn for ; Fri, 11 Dec 2020 16:32:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf33.google.com with SMTP id az16so2335622qvb.5 for ; Fri, 11 Dec 2020 08:32:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=T2fw1rP+SvO8gltVYW3mHpydrmwhHC7q/HYjgn5cCA4=; b=W1FhmU5o+QAwms7mfYLKQx3eyiT63nzczH4HQdbJfQCD14EXmZyMaij0penjRqe0Qs 4moGQePbr7epUl2Z6NH244v5/ZdosIxWI1G8eOFy8UEeCup83yxXP20/0td/B8JyAKQ1 gibXHCy8f6Ojxx6BsMqsLNK3dRQ7C+MlOwQcUtMArNhbJ8CnA8zj3SzXrj9EZIQ0XkmH OBY3uTU/nvSbD7QSiS4cvNZ1UKgutKaAcY59L+ZiZgeqhM5iFYFrJkSsTQrvJjGK968w bG1tMlW9/N73aANjJSqW7D6t4eCKgwRfxPhUKbKA/syOJE1mgsj7UuXe17KgAQe0rLJM eQ1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=T2fw1rP+SvO8gltVYW3mHpydrmwhHC7q/HYjgn5cCA4=; b=qwgwygltG3onj62AIxQdNOJkgy9addFoYK43fx8bPqGcVCfrlKrPprwMxT13DOXYBu kxvpvZNDauuBmEkDJohe1GRbOjG1TvDBP8zwlx4XYpSwO9JlxEQtsLJjSsJ3Xau/i9AV o1l9EqZE1QGaQ7wESewfxw/wRrOmfABjQWfwIjUk7ckaUBxbKpNGo6x41zcnGIKYZAh8 AiboSI9vONK0YF/BXRScvGg97FduhboA2+jpZNP+5EZnBGXNBS29/VUbUNO7/ZRb8aTw 9cpkOOE1e4hZiB7rjM+1SJI1ZIdQTMD/0kHKYVVErITzU5Rqt+cyNbx/FqI40k7mNNwd 6J4w== X-Gm-Message-State: AOAM533xacjhAhGaf/2R+svGROXNmGoPHUlmYRVg8TVs/hhTU8+4KpgT wzpaoyBRjS4aPJ95IjkvLDCp59OWHMx1vHdDKD6bm4PRtQK0Rg== X-Google-Smtp-Source: ABdhPJxmlnG2TxScN6n3YfCFfhB0BBOw6UOt4VCQiOOk0eEQwX8Jv3NoKKP1muDwN1pUObMhnPkZPMDF35VzbhNiAc0= X-Received: by 2002:a05:6214:16cb:: with SMTP id d11mr16387472qvz.62.1607704365666; Fri, 11 Dec 2020 08:32:45 -0800 (PST) MIME-Version: 1.0 References: <20201210223443.GA64504@freefall.freebsd.org> <8e48e2ea-59d8-d2fd-4e25-e12088ff3a36@gmail.com> In-Reply-To: <8e48e2ea-59d8-d2fd-4e25-e12088ff3a36@gmail.com> From: Warner Losh Date: Fri, 11 Dec 2020 09:32:34 -0700 Message-ID: Subject: Re: svnadmin equivalent? To: Marc Branchaud Cc: Konstantin Belousov , git@freebsd.org X-Rspamd-Queue-Id: 4CsxCg28Lpz4Zcn X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 16:32:47 -0000 On Fri, Dec 11, 2020 at 8:49 AM Marc Branchaud wrote: > On 2020-12-10 11:37 p.m., Warner Losh wrote: > > On Thu, Dec 10, 2020, 9:35 PM Konstantin Belousov > > wrote: > >> > >> Can we have it scripted, per repo, and scripts available somewhere ? > >> It is convoluted list of per-repo branches. I want a simple means to > >> run something and get the guaranteed clone of all material from the > repo. > >> > > > > git clone --mirror > > "git clone --mirror" fetches everything, but it has two potentially > confusing side-effects: > > * Mirroring creates a "bare" local repository without any checked-out > files (all you get are the contents of the remote's .git/ directory). > This doesn't mean it's unusable, just that it's not *directly* usable > (for example, see Mathieu's suggestion about "git worktree add"). > > * More subtly, mirroring also removes the distinction between your local > branches and the remote repo's branches. So you don't end up with any > "origin/XXXX" branches. This can be very confusing when you've made > commits to your local "main" branch that get clobbered by your next fetch. > > Here's how to get absolutely everything in your regular-clone'd repo > while preserving the "origin/" namespace for the official repo's branches: > > # First reset the config to the default that a non-mirror clone creates: > git config --replace-all remote.origin.fetch > '+refs/heads/*:refs/remotes/origin/*' > (WARNING: If you've configured other remote.origin.fetch specs, like to > retrieve the "notes" namespace, this command will remove those and > you'll have to re-configure them.) > > # Then configure fetch to also get all the other stuff: > git config --add remote.origin.fetch '+refs/*:refs/origin/*' > > The default setting is important to make commands that interpret branch > names work properly with remote ("origin/") branches, > because they look for remote branch names under the refs/remotes/ > namespace. > > The second setting puts *every* reference in the remote repo into your > repo's "refs/origin/" namespace. Since nothing in git uses the > "refs/origin/" namespace we're free to do whatever we want with it > without breaking anything. The slight inconvenience is that to access a > non-branch, non-tag symbol we have to prefix it with "refs/origin/" (not > just "origin/"): > git show refs/origin/internal/admin:mentors > git log refs/origin/vendor/zlib/1.2.10 > git checkout -b my-arm64-hacks refs/origin/projects/arm64 > That;s good advice. I'll add this to my FAQ. It is a bit like checking out from http://svn.freebsd.org/base, though, which gets a lot of chaff... Warner From owner-freebsd-git@freebsd.org Fri Dec 11 18:13:34 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B27684B6DFA for ; Fri, 11 Dec 2020 18:13:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CszRy3Qtjz4jHY for ; Fri, 11 Dec 2020 18:13:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 757954B6DF9; Fri, 11 Dec 2020 18:13:34 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 73A8D4B69C5 for ; Fri, 11 Dec 2020 18:13:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CszRx3vm2z4jFM for ; Fri, 11 Dec 2020 18:13:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x729.google.com with SMTP id z188so9288258qke.9 for ; Fri, 11 Dec 2020 10:13:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=aFuSKz/O9lKj4LBuhIbxgczkVqggh0uoZn6LgYvFJGQ=; b=rnev0kiHkULq43UAcE0AU9t/1j4LneAnScwhIQYMiShupInGVR8/o5LlSIaCV++07i vuQuc9ptfRaF/6mlnq4u2GnqWOpzJ3RP7Pkzd5E+OVZnD8XIhX+/3rLMgEvEO5JfX0ZI ZGp1UlGGVKNdAb+3xudnnLrS4XMPKzsWwrenm9Kn1DxNPNO2y1yL3bt57CH/WECp0lM8 fl9dCe5JuFYJ5CTl7xXMcZMsCiLkpWcmdIjwg+og1Dx8BAaOSpm8mPGOMMj0wsoZqMm7 +wWtEqxk04XFSMalI51XQ+rydEPAdRXX6mWoACUjgrqRcaIlFKWlW8JoUHWi1Xd5akaF 0Yng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=aFuSKz/O9lKj4LBuhIbxgczkVqggh0uoZn6LgYvFJGQ=; b=pj1SPBjIU/jsGRCoQk7hriP7clkO98NSc/yLlX0iygwZuSvCfIzYVixDjk31nuQmBX oNEFKdRjYyD7fzE15LoQEgZgQrYy2t/43rQGKU1O3myIN5XJoodHua6er76UvRXHg998 A+aY6mq4v7/QhuT1XZA/4T4yKJZjyUepw+TBdDvttw1Orwy7shzPDbCJ1y9DNnQ5Y0bO B6WgfZ7X/8pWoWkov4sFwq2lrNOQ62WPp5H6RwE+cO5Psk4so3xI/cBK0slomZwlMaLA EeU0SRZmV8rm4JHI/R1gebxkeFS/5WtsyInaQ4jx6hmtT72xqADIB9vuQcnnycIPSWTe xLZg== X-Gm-Message-State: AOAM53293ItP3XDti7+J6JnStexmOC+eHcgNvf6kdQDsJWkBoEjoBO59 cQEuVUDIDl4UgyaCSyUA25qJ30LZuk7i4HuMvAm81GbcSWXTx7a4 X-Google-Smtp-Source: ABdhPJy1Gz+SNPd8zFHRyCth86t0lJoDW4AqUIYeaUROGuRmIV9a7mqq96WxMepKZffrMTVKMYPQE8r6YgirJNpFz+E= X-Received: by 2002:a37:a614:: with SMTP id p20mr17277829qke.359.1607710412388; Fri, 11 Dec 2020 10:13:32 -0800 (PST) MIME-Version: 1.0 References: <20201210223443.GA64504@freefall.freebsd.org> <8e48e2ea-59d8-d2fd-4e25-e12088ff3a36@gmail.com> In-Reply-To: From: Warner Losh Date: Fri, 11 Dec 2020 11:13:20 -0700 Message-ID: Subject: Re: svnadmin equivalent? To: Marc Branchaud Cc: Konstantin Belousov , git@freebsd.org X-Rspamd-Queue-Id: 4CszRx3vm2z4jFM X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=rnev0kiH; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::729) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [0.00 / 15.00]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::729:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::729:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_LONG(1.00)[1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::729:from]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[git]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 18:13:34 -0000 Hi Marc Thanks for the detailed explanation. I've updated https://github.com/bsdimp/freebsd-git-docs/blob/main/faq.md to include details discussed here. Please let me know if I've missed anything, or if I've botched something. BTW, I wasn't sure why you needed to reset the default first. Most people will have that or just that an the notes. There's no reason you can't add this too that I can see, but maybe I'm overlooking something. Warner On Fri, Dec 11, 2020 at 9:32 AM Warner Losh wrote: > > > On Fri, Dec 11, 2020 at 8:49 AM Marc Branchaud wrote: > >> On 2020-12-10 11:37 p.m., Warner Losh wrote: >> > On Thu, Dec 10, 2020, 9:35 PM Konstantin Belousov >> > wrote: >> >> >> >> Can we have it scripted, per repo, and scripts available somewhere ? >> >> It is convoluted list of per-repo branches. I want a simple means to >> >> run something and get the guaranteed clone of all material from the >> repo. >> >> >> > >> > git clone --mirror >> >> "git clone --mirror" fetches everything, but it has two potentially >> confusing side-effects: >> >> * Mirroring creates a "bare" local repository without any checked-out >> files (all you get are the contents of the remote's .git/ directory). >> This doesn't mean it's unusable, just that it's not *directly* usable >> (for example, see Mathieu's suggestion about "git worktree add"). >> >> * More subtly, mirroring also removes the distinction between your local >> branches and the remote repo's branches. So you don't end up with any >> "origin/XXXX" branches. This can be very confusing when you've made >> commits to your local "main" branch that get clobbered by your next fetch. >> >> Here's how to get absolutely everything in your regular-clone'd repo >> while preserving the "origin/" namespace for the official repo's branches: >> >> # First reset the config to the default that a non-mirror clone creates: >> git config --replace-all remote.origin.fetch >> '+refs/heads/*:refs/remotes/origin/*' >> (WARNING: If you've configured other remote.origin.fetch specs, like to >> retrieve the "notes" namespace, this command will remove those and >> you'll have to re-configure them.) >> >> # Then configure fetch to also get all the other stuff: >> git config --add remote.origin.fetch '+refs/*:refs/origin/*' >> >> The default setting is important to make commands that interpret branch >> names work properly with remote ("origin/") branches, >> because they look for remote branch names under the refs/remotes/ >> namespace. >> >> The second setting puts *every* reference in the remote repo into your >> repo's "refs/origin/" namespace. Since nothing in git uses the >> "refs/origin/" namespace we're free to do whatever we want with it >> without breaking anything. The slight inconvenience is that to access a >> non-branch, non-tag symbol we have to prefix it with "refs/origin/" (not >> just "origin/"): >> git show refs/origin/internal/admin:mentors >> git log refs/origin/vendor/zlib/1.2.10 >> git checkout -b my-arm64-hacks refs/origin/projects/arm64 >> > > That;s good advice. I'll add this to my FAQ. > > It is a bit like checking out from http://svn.freebsd.org/base, though, > which gets a lot of chaff... > > Warner > From owner-freebsd-git@freebsd.org Fri Dec 11 19:37:06 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C06824B874A for ; Fri, 11 Dec 2020 19:37:06 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4Ct1JL2wgcz4nWL for ; Fri, 11 Dec 2020 19:37:06 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 645F44B8749; Fri, 11 Dec 2020 19:37:06 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 642244B892C for ; Fri, 11 Dec 2020 19:37:06 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ct1JL20gtz4nJL for ; Fri, 11 Dec 2020 19:37:06 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: by mail-qk1-x735.google.com with SMTP id z188so9562728qke.9 for ; Fri, 11 Dec 2020 11:37:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=JXrJdLGqfiqv4Xv8UInllShMYDpWcdoV+DYU99+vUr0=; b=CFGZl8uqBPo+hhD1lPY0q0JOQpxFuyC9mLkgu4RpRdKLr8Nz7W93FKuJUiUT6A6iC/ syUISFZ5ectfr6aJ8q36vts7qsx6Zypu0181Q3CYPjnBYrWuR7rlONViJyQ9/H2AyxFH TIiRnghclpAZSnhm2GCOB9LaXjlyu1eGk/ANOC8TZmyPPbw3hhN5BG5oph5dHp1iart6 rgDihPu8gdTwpu+tyDS+y1idJBBsTQSzWQQKQ2P6hacsiz2Zqpkh+EkhB1yO8dluFtRh nQgKvuIfiwulk1aPeeglZdvLVk2tR6/l99AL1+TXBquMSGyIkNgCZ2ySDqFNhCz2zzgb B7Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=JXrJdLGqfiqv4Xv8UInllShMYDpWcdoV+DYU99+vUr0=; b=D017BJR6SzoBNTqXVwyuKs6LIMH38OgGFYxgKOEN6C9SWSgQS0ODKHDlMbaLlClLGf mVQgeAHLCLvFS55N+eEG2hu/ZSruMO3HFWpkQFyzXvRMG9cwPktfm1OZDw76pL/xB+Z5 6oxhmJdYfqvJ00RGoXhA/wbhjdtz8FChQhqDjN+Hh770d9whg5H2sITU9S8X3LeqWeiQ vHYbIUaMx8dJhxC4MBcug+p6WIcLnRWJTgqUD0KDzsN2XGL+asaRK4p9Sa3XCQ+VL2oK gVW6/r6pYlWR54PpCmwoopcuzB0ZR7IRTHZu03WSVzFnkI05k+628XKgxdsa/ueAns+H hkmQ== X-Gm-Message-State: AOAM532NhmQbJ+byIg6vg21n5cNS66HeA0SwGDpTOqam6o+7yqPxSwal 7GvsxCYn6t5ePqB0+iczd8n+CXrHWpLjFw== X-Google-Smtp-Source: ABdhPJxPzAaaUvdw/2ka65niL/J4UmZ/YIRALZEVKwLujrS/UUnMDDLxsLnlJmzLpMZkOHmoIf/Ryg== X-Received: by 2002:a37:6442:: with SMTP id y63mr9221730qkb.192.1607715425234; Fri, 11 Dec 2020 11:37:05 -0800 (PST) Received: from [192.168.222.18] (192-222-183-158.qc.cable.ebox.net. [192.222.183.158]) by smtp.gmail.com with ESMTPSA id t3sm8584534qkj.27.2020.12.11.11.37.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Dec 2020 11:37:04 -0800 (PST) Subject: Re: svnadmin equivalent? To: Warner Losh Cc: Konstantin Belousov , git@freebsd.org References: <20201210223443.GA64504@freefall.freebsd.org> <8e48e2ea-59d8-d2fd-4e25-e12088ff3a36@gmail.com> From: Marc Branchaud Message-ID: Date: Fri, 11 Dec 2020 14:37:03 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Ct1JL20gtz4nJL X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 19:37:06 -0000 On 2020-12-11 1:13 p.m., Warner Losh wrote: > Hi Marc > > Thanks for the detailed explanation. > > I've updated https://github.com/bsdimp/freebsd-git-docs/blob/main/faq.md > to include > details discussed here. > > Please let me know if I've missed anything, or if I've botched something. Nothing botched, just a couple small points that aren't strictly 100% correct. How would you prefer to receive my comments & suggestions? > BTW, I wasn't sure why you needed to reset the default first. Most > people will have that or just that an the notes. There's no reason you > can't add this too that I can see, but maybe I'm overlooking something. I recommended the reset because if anyone had followed the mirroring advice they would have been in the potentially confusing state, and just adding the "+refs/*:refs/origin/*" refspec would not have gotten them out of it. M. From owner-freebsd-git@freebsd.org Fri Dec 11 20:08:55 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4BD884B9734 for ; Fri, 11 Dec 2020 20:08:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Ct21300Zrz4q4B for ; Fri, 11 Dec 2020 20:08:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id F22694B9A06; Fri, 11 Dec 2020 20:08:54 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F1E754B94FA for ; Fri, 11 Dec 2020 20:08:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ct21269Jsz4qHc for ; Fri, 11 Dec 2020 20:08:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72d.google.com with SMTP id 19so9676823qkm.8 for ; Fri, 11 Dec 2020 12:08:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=4FlPg9hVdmcCB6v4oxa/WCZwEvE4SBKwbt1SSbHJQak=; b=dz421qd8DTGXwrlWf7w0XxfX/0MNONak/tcb6wIk8phP0zFMZCdtZkV3wftRPjVd67 h9hDdIMh4n8xd/Ts9yzDEnJzHM2iZIm4TQJZrjeyU3oVNaNWqvZWm8RhvT9zohZut8aC DrNsOG2fFuThmqMRpRtIFVjw53QJL1U/QX16c3vEAAA3AVOrnJyPokRhIwCsN/dWkHs2 NbAdWooqjBXoYgR7qyHPnP8YilU1LTuRVxNr17CWAnH7LFFav8HCof6jD4oGUpy9OG9/ Q6lVd2V0u67mt8++0I1dhdK95uCbT/5OM2F8+v875qSx5lHUrpXCD9Lq7DgYms2/m3RR Xf7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=4FlPg9hVdmcCB6v4oxa/WCZwEvE4SBKwbt1SSbHJQak=; b=YakzSk6Eq0l8qk1B8g2rEcZJ3Br1suyRt0VDI3SABwCPkb8GJlhQFEPN9Dxzl7fF+m /qT8vp7HLvOzR0j74ZJM5bRp5J3EyHl3K3j7zwaAJa4jOnVoss2+glEyfflAQcwQT6Em G1991C2I8Y52cw3GJVlQvH6zOw9+pDuhyuB0KRrFh42EnV69UV8MfkU7PaJSTRssXxYo 5Haw4FGXtHydCz8ext1byVeRSkgkjOxBHrSEHqEAaFOKuZ7j8cvworzByHDkACWiPpRY 6KEHlHSNrISLlGcs1uaP9rEG4/89gbXqH3vgftttdnrdO1Czl6ymEjxZOL5I5cyTiEx3 zzLQ== X-Gm-Message-State: AOAM5318WbYXqtpjG1SeFPtJW0hXfEDU7uBqGuUA8qzLvDSqiE83QFit Jhvgz3+ceRdfbnmeVa7+B7KxGg8hGuPUJEv1Xn3Saw== X-Google-Smtp-Source: ABdhPJyNorNuMkB+Fcphb5bsYZZX0Cq83hgxT4eEUL48u1LtYuCBd41UKtX45zilCpEw6eds42p+VkR4OCtVUnJKeYU= X-Received: by 2002:ae9:ebd5:: with SMTP id b204mr17907767qkg.195.1607717333097; Fri, 11 Dec 2020 12:08:53 -0800 (PST) MIME-Version: 1.0 References: <20201210223443.GA64504@freefall.freebsd.org> <8e48e2ea-59d8-d2fd-4e25-e12088ff3a36@gmail.com> In-Reply-To: From: Warner Losh Date: Fri, 11 Dec 2020 13:08:42 -0700 Message-ID: Subject: Re: svnadmin equivalent? To: Marc Branchaud Cc: Konstantin Belousov , git@freebsd.org X-Rspamd-Queue-Id: 4Ct21269Jsz4qHc X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 20:08:55 -0000 On Fri, Dec 11, 2020 at 12:37 PM Marc Branchaud wrote: > On 2020-12-11 1:13 p.m., Warner Losh wrote: > > Hi Marc > > > > Thanks for the detailed explanation. > > > > I've updated https://github.com/bsdimp/freebsd-git-docs/blob/main/faq.md > > to > include > > details discussed here. > > > > Please let me know if I've missed anything, or if I've botched something. > > Nothing botched, just a couple small points that aren't strictly 100% > correct > Thanks for checking.... > How would you prefer to receive my comments & suggestions? > A pull request with corrections would be ideal... If that's not your cup of tea, email suggestions. > > BTW, I wasn't sure why you needed to reset the default first. Most > > people will have that or just that an the notes. There's no reason you > > can't add this too that I can see, but maybe I'm overlooking something. > > I recommended the reset because if anyone had followed the mirroring > advice they would have been in the potentially confusing state, and just > adding the "+refs/*:refs/origin/*" refspec would not have gotten them > out of it. > Gotcha. Thanks. Warner From owner-freebsd-git@freebsd.org Fri Dec 11 21:39:56 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E78F74BB922 for ; Fri, 11 Dec 2020 21:39:56 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ct42456hyz4vZj for ; Fri, 11 Dec 2020 21:39:56 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.codepro.be", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 88CC424D01 for ; Fri, 11 Dec 2020 21:39:56 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 275B0C80C; Fri, 11 Dec 2020 22:39:55 +0100 (CET) From: "Kristof Provost" To: freebsd-git@freebsd.org Subject: MFC procedure? Date: Fri, 11 Dec 2020 22:39:54 +0100 X-Mailer: MailMate (1.13.2r5673) Message-ID: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed; markup=markdown Content-Transfer-Encoding: 8bit X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 21:39:57 -0000 Hi, A discussion elsewhere about pre-commit triggers checking commit permissions reminded me that I don’t yet fully know how we’ll handle MFCs. I”m thinking especially about MFCs of commits initially done by someone else. A `git cherry-pick ` will result in an author tag with the original author. Do we want to change the committer name? If so, as I understand it that’s relatively simple in Git: cherry pick the change, and run `git commit -amend —reset-author’ before pushing. While on the subject of MFC, I’m similarly not quite clear on wether we plan to mirror SVN exactly and rewrite commit messages to include the ‘MFC ’, or if we’re going to do the more git-y thing of just cherry-picking and pushing like that. Perhaps I overlooked it, but I don’t see any documentation on changes/expectations for MFCs in a git world. Would it be helpful if I wrote up a proposal for whichever option the transition team prefers? Regards, Kristof From owner-freebsd-git@freebsd.org Fri Dec 11 22:33:03 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5B8764BD3CD for ; Fri, 11 Dec 2020 22:33:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ct5CM21VCz3FlC for ; Fri, 11 Dec 2020 22:33:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x834.google.com with SMTP id h19so7665686qtq.13 for ; Fri, 11 Dec 2020 14:33:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+XMf5cCYDilzw30/79QkK3aAZgTqDYU3xLwu+p2Gnds=; b=l6lyD3fbcKzWy03K+hMX0DfJRBJ3CIC2FSmVomen34PM7NXPyLO1O2Z5IdgqdqIIfK 1nQQzlN2dD+ldzh9MmzOIak+ajGzGFi4/q2jvQEtSYGfafHR2BFNMJiUqSgiFHg91zib ytoqB+4iLLDiVSm9QpcySrw7YT0onYWh1uebGD3M+kUHWFg36WZ3EwXx84ZbX4xpCAMm wJRnZ7EzdlCPvmMmg1k6cqNSAjH9iJyUCN5V89pQw+h3ZjbYgo9nFy21Qa7JZipc85N2 ORW8t2ZNM1nXqpPu6YIS83gGWntSvLXjxEyaZsw5vaaeIAXMfQMr1nizUrzUoIlfHyK+ keug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+XMf5cCYDilzw30/79QkK3aAZgTqDYU3xLwu+p2Gnds=; b=dDntQreDqQ7v9oLnfLmhDhp6osHFQZ/VShfqggF0XlrMqZyR8WxsTFBpPLg7w4G3bo 0e8VK7tOKsiezTLoCzXMZOKJ4m3gskPEfkb0nsGxUuXk/QpPBRne6DP5IrjePKJJtReF QBkqXXaMHziiRCDW5i/f8RTiYgHekaTGcDum0fAX21XIPMiepynTxbqCecOvqio0vHXg v+MFxPVEzOLeXjnaevdIG86gozx7ELw1eOCjRky6rhdawMwyjv/t/YIS0/+uP2f6RdeS W48HEef/O46PEK0Ujwe0NuZLvcyWjI6AHs0jpuUd98ExdD6glfi8M/8QVETNXl5e7jq/ xjFw== X-Gm-Message-State: AOAM531SMDwjWi/GCMyCgx8ofF2PNNzvETJSF/Qqx0rEYfIuPdoRTYj2 cyjEo70v3y4FcHBnb2BMaWimOFEJW8lZ/6Sq07NuWQ== X-Google-Smtp-Source: ABdhPJy3CuMtSvmGx47Ft130k6wQiMlon92UPIMJzSD3+Hqg/PW1Xb5vgCcTZSifgl3frbwwF8+nBP+FDl1Yp+gHpbY= X-Received: by 2002:ac8:4910:: with SMTP id e16mr18357174qtq.244.1607725981555; Fri, 11 Dec 2020 14:33:01 -0800 (PST) MIME-Version: 1.0 References: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> In-Reply-To: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> From: Warner Losh Date: Fri, 11 Dec 2020 15:32:50 -0700 Message-ID: Subject: Re: MFC procedure? To: Kristof Provost Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4Ct5CM21VCz3FlC X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 22:33:03 -0000 On Fri, Dec 11, 2020 at 2:40 PM Kristof Provost wrote: > Hi, > > A discussion elsewhere about pre-commit triggers checking commit > permissions reminded me that I don=E2=80=99t yet fully know how we=E2=80= =99ll handle > MFCs. I=E2=80=9Dm thinking especially about MFCs of commits initially don= e by > someone else. A `git cherry-pick ` will result in an author tag > with the original author. > > Do we want to change the committer name? If so, as I understand it > that=E2=80=99s relatively simple in Git: cherry pick the change, and run = `git > commit -amend =E2=80=94reset-author=E2=80=99 before pushing. > > While on the subject of MFC, I=E2=80=99m similarly not quite clear on wet= her > we plan to mirror SVN exactly and rewrite commit messages to include the > =E2=80=98MFC =E2=80=99, or if we=E2=80=99re going to do the = more git-y thing > of just cherry-picking and pushing like that. > > Perhaps I overlooked it, but I don=E2=80=99t see any documentation on > changes/expectations for MFCs in a git world. Would it be helpful if I > wrote up a proposal for whichever option the transition team prefers? > I've not written up the proposed MFC procedure. I plan on doing that after I get the vendor import stuff I'm working on right now done. I suspect that we'll mirror much of the SVN process and we'll have a messy period while we figure out what works best for us. These are all good questions. I think the answers are "we want to add -x to the git cherry-pick" to cope with the MFC tag, and we want to retain them all for squashed MFCs. We'll want to reset the author to conform with local tradition. I'll post it to this list when I've written it up, and I'll be sure to CC you. Warner From owner-freebsd-git@freebsd.org Fri Dec 11 23:06:06 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E0AB44BE16B for ; Fri, 11 Dec 2020 23:06:06 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ct5xV5ml3z3JGG for ; Fri, 11 Dec 2020 23:06:06 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk1-x735.google.com with SMTP id z188so10133931qke.9 for ; Fri, 11 Dec 2020 15:06:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=9TTBM73kLk2Lm28f5y+Y3pRiZGqxLklJ7XVIpGIeW+E=; b=MUn3Rxpd2LrB3C+THDtMJ/zVZh/54S1yfDdP6ayElqXK5snK6rAs+RvtiDQPX2BneD +FV1rhHtFIR+Vqt2pPQfeB6evb7eJGsS1O+4cAuCCCissVV9vHecGuxPoYoLcjrmQpg3 rdsflGnjNGF0eEwqW87O5ETn8f97JbQyqVi0I2c6n1TQ0/P9MSPLHKl7ByfsZm1BWmKG LujvWzTlAxr2ymwAuL93xhJEpGPdyZLPIjV8k3lIfKmsv18g6/AAkS2foK2xRS1rTFAJ v5kWK44LAg64g/JGkV5Da0UtRkSQ2vzoP7CouedhzaW0IHSMNHGJV5Hbr6xhWh5rEwWn AOAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=9TTBM73kLk2Lm28f5y+Y3pRiZGqxLklJ7XVIpGIeW+E=; b=g6zOhhJXM3UiGQ8vCQjD9jL1zBVpJ4VeKn9QrudxKEnWxcJeHcDnlqXCXQscgmU6Sp kpUa7HMpflDsDWVro6iMelPwuHLt989fOCbhZEqEdIHVEu/ABtNJI1IRpWbH50Vdw6H9 jM4xiyvpo369SMtcaMS+0VARSUE0v/1WYMbwr3O4+/bNxebLTCf8XPu8x1cjUBvkWoFj 0wy+YmiPYf66kOrst3RFHIV1Ng/ReVI+sCdaSYKym4n9LfySYFAhO6mQ7onI0eBBjVxl 7iDQPbqkbpXVx5w6C0hqjGXenbreckmC4SwmNRTvNKVJp2CWzEJ4UO1oTQBWFpQfm2LG /oig== X-Gm-Message-State: AOAM533A0pxxlRYcHYJQ8z+9TiBl6MCeOwYg9jcYxvsrbCeK6s+wozNC PWC/BC+Fun6UevaRohoKnp9iYA== X-Google-Smtp-Source: ABdhPJwL6v+XYgraFsfq4oE3RkTwDX5+H/+nmFp3zcNrnyEEn5sGy2+eDKJff5Ft7i6zKggN0Nx94A== X-Received: by 2002:a37:2e05:: with SMTP id u5mr8005279qkh.228.1607727965663; Fri, 11 Dec 2020 15:06:05 -0800 (PST) Received: from mutt-hbsd (pool-100-16-222-53.bltmmd.fios.verizon.net. [100.16.222.53]) by smtp.gmail.com with ESMTPSA id g63sm8409157qkf.80.2020.12.11.15.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 15:06:04 -0800 (PST) Date: Fri, 11 Dec 2020 18:06:04 -0500 From: Shawn Webb To: Warner Losh Cc: Kristof Provost , freebsd-git@freebsd.org Subject: Re: MFC procedure? Message-ID: <20201211230604.sohyte3dfocfmx2r@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="brkoskdolpapl5ex" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4Ct5xV5ml3z3JGG X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 23:06:06 -0000 --brkoskdolpapl5ex Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 11, 2020 at 03:32:50PM -0700, Warner Losh wrote: > On Fri, Dec 11, 2020 at 2:40 PM Kristof Provost wrote: >=20 > > Hi, > > > > A discussion elsewhere about pre-commit triggers checking commit > > permissions reminded me that I don???t yet fully know how we???ll handle > > MFCs. I???m thinking especially about MFCs of commits initially done by > > someone else. A `git cherry-pick ` will result in an author tag > > with the original author. > > > > Do we want to change the committer name? If so, as I understand it > > that???s relatively simple in Git: cherry pick the change, and run `git > > commit -amend ???reset-author??? before pushing. > > > > While on the subject of MFC, I???m similarly not quite clear on wether > > we plan to mirror SVN exactly and rewrite commit messages to include the > > ???MFC ???, or if we???re going to do the more git-y thing > > of just cherry-picking and pushing like that. > > > > Perhaps I overlooked it, but I don???t see any documentation on > > changes/expectations for MFCs in a git world. Would it be helpful if I > > wrote up a proposal for whichever option the transition team prefers? > > >=20 > I've not written up the proposed MFC procedure. I plan on doing that after > I get the vendor import stuff I'm working on right now done. >=20 > I suspect that we'll mirror much of the SVN process and we'll have a messy > period while we figure out what works best for us. >=20 > These are all good questions. I think the answers are "we want to add -x = to > the git cherry-pick" to cope with the MFC tag, and we want to retain them > all for squashed MFCs. We'll want to reset the author to conform with loc= al > tradition. >=20 > I'll post it to this list when I've written it up, and I'll be sure to CC > you. For what it's worth, HardenedBSD MFCs its commits with the following command: $ git cherry-pick -xs commit_hash Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --brkoskdolpapl5ex Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl/T+1kACgkQ/y5nonf4 4fqB1g//ZL9yMWdNaY0/SEHgmxMXypC+pvnVKjr9kZ/uNXdG+sI9h51mFrMMY0ae 4n4Jv4fvr7F+puyvt2Ox1TsIW4SI+m8A7AkcFN1BGxuo6osOqqjudbthWpxOcn1+ pb+iuq0jraq2Dzwx2y6qJVmQIzV0GpmLO9YGtUZCdF+saY4OUbk6UQHCsi+XgHRR h+H84NZQUBHtjr7Mr3EnwQ+Uq3gy+1Fw4XSs8amyjXkwb7tiQcHfTdK/+QNKmDR8 gC/n6C3t9vOoXY/THD/nTI7WfXkgSH+W2LTPLsVLnEbb6Q+XskDXpiNM09bsQ3hO 0xnQ5CLiLDn4ZArgnh6xJLIM/WZlDrTASiMkkOwpctz8H+zFDIKXfDy75raZya4Q QZn35KQu3FH+NlK5enwBQu+n6qOuDsF9r8aWzrwgC2AfKe1QQs/HkX03uU8GeNRH H7adluLALkJCbqEpecv3+bK+pKsx4ZVW2sV3syrKvTr0Gts32VDXMIznQ7qLZw5M 2BAZKu1BkIiu4dJ9yNxjHbZ15V21wALZhneXoKXlLzyNCk6LlCbrBheuIv8RLpDs d0hH3qta02ddXBa0klc+6b+2abFkZ54RkJklZaXGcSTkmu5m+sehzURvAUs91WYi lRxqNiSr9d3ELJU3EbUtToM+xbuLFCEC1tsds8LnsLX3MZCOU34= =tKyZ -----END PGP SIGNATURE----- --brkoskdolpapl5ex-- From owner-freebsd-git@freebsd.org Sat Dec 12 19:04:50 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B40AF4BDB96 for ; Sat, 12 Dec 2020 19:04:50 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CtcXf4WZrz3phZ; Sat, 12 Dec 2020 19:04:50 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: by mail-oi1-x22e.google.com with SMTP id p126so14142463oif.7; Sat, 12 Dec 2020 11:04:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=kA0e3Y70PvN2ESuRJZsJAZQRVN+Y0LhdufWGJJsv4x0=; b=XT99BcmkiFt0NWoRM6XjuqPGpF3BYLgcY3JjPugSQN6ItEc4wVksvLdjBl4Xpas8+o +mLUoawpdH8efVPbkn9Hb/EZEem0JGIgNnmfXp0rbtWcSPeS5vclIvT3xqrfqpiGmnxW ewsAvLwsVWtOvlDL84sAU1qVwv6W564cOBGuveXVkdk0ppZW/uRtvPm+1VoR9g3xx1K5 0jLYz7nbRCavwFb09jZgBoH3cbDlGuq7CzfuDyNRjWaGnDKk3GkzJI7NzxTzT+9wjxnj IAWtS2SB0qElouCHgpMNSpaSUTvGG5lxBH9Mv3Z4hPmOspi/Zn76ukU6AWmKlRzphs1o oyqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=kA0e3Y70PvN2ESuRJZsJAZQRVN+Y0LhdufWGJJsv4x0=; b=AX6wXqu4fMBgqOC9Y7x+BXv75e+wRymU7pmj+xOur2fqpGNShgjIuqNdCamQZGo+NG L72e+vXPTFh3RIrogdv+oTZxdBqckFTQUBbYDqgCiayY+Zv+aQAhRu6hBeQi1b4E09EA yrdym1jz+3NX61bpmClHnwS8iTrMJb503mJlz8iH9s+jCgiE3T1c/mRcEDyQLXKiDqLH I2sNfeHbgdzCYjhrvg0igTkm0K49Mm9/5KoX8sX9Ieu/ko0xJIQY6obbFnR299nZFkOM xGkIn2LeCxiNoZ7z74lQEiFKhyfXITncIwzao/Kbpby1Bh+ta3zCV6/gYhsCTq9sSPVS kPVA== X-Gm-Message-State: AOAM531Uxzyi7JI9JABVlK/JYZN8oMjLJOhImutvZlVu1RnPeZQ2o425 qvKYkBBEd1OCZjqjFcY0vGOWTq3LNBxzsJnyyhnunPCH X-Google-Smtp-Source: ABdhPJxT3c2iN94X1CDSXCsQpNhEOhcs9exSHHydFWgWgoGoWjPRDQ/BN+Al+Ykw0mjvX1pyQ9XbTqfv//iwXj5B/oE= X-Received: by 2002:aca:61c5:: with SMTP id v188mr13631950oib.66.1607799889423; Sat, 12 Dec 2020 11:04:49 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a4a:970e:0:0:0:0:0 with HTTP; Sat, 12 Dec 2020 11:04:48 -0800 (PST) In-Reply-To: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> References: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> From: Oliver Pinter Date: Sat, 12 Dec 2020 20:04:48 +0100 Message-ID: Subject: Re: MFC procedure? To: Kristof Provost Cc: "freebsd-git@freebsd.org" X-Rspamd-Queue-Id: 4CtcXf4WZrz3phZ X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Dec 2020 19:04:50 -0000 On Friday, December 11, 2020, Kristof Provost wrote: > Hi, > > A discussion elsewhere about pre-commit triggers checking commit > permissions reminded me that I don=E2=80=99t yet fully know how we=E2=80= =99ll handle MFCs. > I=E2=80=9Dm thinking especially about MFCs of commits initially done by s= omeone > else. A `git cherry-pick ` will result in an author tag with the > original author. > > Do we want to change the committer name? If so, as I understand it that= =E2=80=99s > relatively simple in Git: cherry pick the change, and run `git commit > -amend =E2=80=94reset-author=E2=80=99 before pushing. > > While on the subject of MFC, I=E2=80=99m similarly not quite clear on wet= her we > plan to mirror SVN exactly and rewrite commit messages to include the =E2= =80=98MFC > =E2=80=99, or if we=E2=80=99re going to do the more git-y th= ing of just > cherry-picking and pushing like that. > > Perhaps I overlooked it, but I don=E2=80=99t see any documentation on > changes/expectations for MFCs in a git world. Would it be helpful if I > wrote up a proposal for whichever option the transition team prefers? I used the following command to mfc changes from git to git: https://github.com/opntr/opbsd-tools/blob/opbsd/opbsd_mfc.sh and this will be an example commit https://github.com/opntr/opBSD-ng/commit/0a08454bf2618c6f22086641e95d7c6058= 967d63 > > Regards, > Kristof > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >