From owner-freebsd-git@freebsd.org Thu Jan 14 04:07:42 2021 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 A844E4D3929 for ; Thu, 14 Jan 2021 04:07:42 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) (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 4DGW4F3Zkpz4jlH for ; Thu, 14 Jan 2021 04:07:41 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-oi1-f171.google.com with SMTP id 15so4617646oix.8 for ; Wed, 13 Jan 2021 20:07:41 -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=tDgA5cZYcZAXPjuvdOMEbUP1IcUTKG1KkHWk+X2Rigk=; b=Nu7XsjbLimcefh+PoO/VxeFBpl0j4F1h12B6WXb9OQp2bnzESqCdfKEjCbgI8lYpqs VX/qqMjIn5mAQe2KZqXWWKqx3UHnrZFZeXY7W7ylBgeM2Sjb7n86fUrQUWs++JhSeIUa j+QKbr5YX8dykZoTTAbsYyO0ONoJ+zUYtJEo7DCTzEKONC/p4SGXNrIi/lzj9MTuChal 2bIZbsiFnATPOzpIADEmATq59YXZw4CnXTanL1Nj+g0Nk5P1Hvidkgnut70Rp+IBrh+3 5VWVv59k2NQ7AKUMN00APQVjkKmcQjDeVfZR5MOBcKxhah10GVlpMjwA+AO4TImcz3IM QO2Q== X-Gm-Message-State: AOAM5337nYpHzr8sbnAuHTaPGLKzz4OPQSsELtrKN7SFebcxeJ319qm1 mbGlwY7/C6pxQQzC1IMoIhXRm10MlR8+aWejh/JHjcaDqLCe7Q== X-Google-Smtp-Source: ABdhPJx7b5FScBIl511PXpQRZPokcZDfoA/oj9tBzb091V7whj9mklMc4Jb30RCOmOHDnAGKlJK56Gli/86Nzdnn1q4= X-Received: by 2002:aca:af8f:: with SMTP id y137mr1567844oie.55.1610597260032; Wed, 13 Jan 2021 20:07:40 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Alan Somers Date: Wed, 13 Jan 2021 21:07:29 -0700 Message-ID: Subject: Re: Git status update To: Warner Losh Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4DGW4F3Zkpz4jlH X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.167.171 as permitted sender) smtp.mailfrom=asomers@gmail.com X-Spamd-Result: default: False [-0.54 / 15.00]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_SHORT(-0.54)[-0.541]; RCPT_COUNT_TWO(0.00)[2]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.167.171: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)[asomers@freebsd.org,asomers@gmail.com]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[asomers]; FROM_HAS_DN(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)[freebsd.org]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; SPAMHAUS_ZRD(0.00)[209.85.167.171:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.171:from]; R_DKIM_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.171:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; 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: Thu, 14 Jan 2021 04:07:42 -0000 On Tue, Jan 5, 2021 at 6:28 PM Warner Losh wrote: > [ note: bcc'd to developers@FreeBSD.org, followup to git@] > Greetings! > > I thought I'd give a brief update on the git migration, as well as clarify > a few important points. > > Basic status: We've cut over to git. The source of truth is in git now. > All commits go into git. Minor issues remain. > > A number of project processes depended on subversion. Most of these have > been converted over, and new ones that are discovered are being converted > when found. > > The git2svn replay has been delayed by illness, but should go live in a > day or two. We will be replaying git commits to stable/11, stable/12 and > the associated releng branches into that for the life of the branches. We > will not be replaying into the head branch in subversion due to logistical > issues. > > We've restarted mirroring to github, gitlab and other hosting services > popular in Asia and Europe. The old mirror is retained on github as > freebsd-legacy should you need it to migrate to the new mirror. The old > mirror has stopped being updated. > > The git working group is looking at ways to enforce better dates in our > workflow. Other projects have various processes in place to ensure better > date sanity. While not strictly required, it can be helpful to have good > temporal consistency in a way that's not a significant source of friction. > > Mark Johnson has a script to streamline phabricator and git integration. > This allows one to create a review stream from a branch with multiple > commits, with automated updating of the commit message, reviewed by, and > updating the review itself after feedback is applied. You can find it at > https://github.com/markjdb/scripts/blob/master/git-arc. Since this is new > code, please take extra care in reviewing commits before pushing to help > guard against bugs. Mark plans to commit the script under src/tools in the > future. > > At this time, $FreeBSD$ tags should not be removed. This causes merge > conflicts (has already caused them). New code that will never be MFC'd > needn't have them. We've turned off enforcement that almost all files have > them. However, since future stable/12 releases will be created from > subversion, the tags must remain until EOL stable/12. We'll revisit this > policy in the second half of 2021 after 13.0 and 12.3 are out to see how > it's working out. But for now resist the urge to purge $FreeBSD$ tags from > the src repo. > > In addition, large scale changes should be minimized for now. The dynamics > of the git tool are different than the svn tool. There's a number of ways > that other projects mitigate the hassles of large scale changes which the > git team is looking into (anybody on git@ can help!). Until we can > publish a set of recommendations (by the spring 2021), we'd ask that you > defer sweeping changes that aren't strictly required. > > It's looking increasingly unlikely that got or gitup will be ready for > 13.0 to be included in base. However, support for both as packages will > likely be integrated into the tree since these tools are a bit different > from GPL git(1). > > Please ensure that your Author Name is the same as your FreeBSD committer > name. We've noticed a few instances where this wasn't the case so far. We > want to make sure that anybody doing this is doing so intentionally and not > accidentally. For the moment, a reminder email will be sent only when it's > noticed. git log freebsd/main..main > > Please be mindful to use a single line summary for commits to make git log > --oneline more useful. This should be followed by a blank line and then the > rest of the commit message. Please take a moment to consider what's in this > line and ask yourself if it's the most important information or not. If > not, consider including it later in the commit message. > > MFCs should continue to be done as before (except using git cherry-pick, > and maybe a rebase to squash), with one exception. Please consider adding > (or reusing from the original commit) a single summary line that describes > the MFC. We know it's on stable/12, so you don't need MFC in this line. > > We're writing up documentation on how to easily bring in pull requests > from github, gitlab, etc. While straight forward, there's a number of > fiddly details that you need to know and we're collecting all this info in > one place. This will help land changes, but won't fix the project's > long-standing 'somebody has to read the submissions' problem. We hope to > also have some recommendations on that. > > Please see https://github.com/bsdimp/freebsd-git-docs for more details. > Please note: I'm a couple days behind on pull requests. > > Warner > Is anybody working on https://ci.freebsd.org/ ? Its stable builders are working, but the head builders are still stuck on subversion. -Alan