From owner-freebsd-git@freebsd.org Thu Jun 25 17:08: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 A151B35FA28 for ; Thu, 25 Jun 2020 17:08:47 +0000 (UTC) (envelope-from sean@chittenden.org) Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) (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 49t61B55dvz4LKt for ; Thu, 25 Jun 2020 17:08:46 +0000 (UTC) (envelope-from sean@chittenden.org) Received: by mail-lf1-x12e.google.com with SMTP id k15so3628214lfc.4 for ; Thu, 25 Jun 2020 10:08:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chittenden.org; s=8eb15515; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+v6zqJOiA+FpfR2mYnQoH7Et6N0xcAuxb+eVikBFFsU=; b=QgjtuBdnCHYX2tD4sDYe5wai2ycZ1oCC8++YFvqDLwKmV4U+sWsaoGT64OQ8jNonPk H0YrU/LjOKqezTgzF+9E7n6ASGQKVdl9a2vPXe4eZxOwCfYO7cjnjMYkzuyf9KhTq6to gjmEuXu4PUsSAyHy2sqjklIn46ZfDKmjVGlO44xTV4grC7qgifBUE8wcpzzuYT2Antxk deEujZ1+/i2nopiN4V+onIXRm6pOgK3hp89UlxK9AOirF3WdwdQ332WaVchF9ZB3sZna WWwmElWAYU1xwdv6yw3oNG0xYLwU7v4C9G7FNHw8ft/opYZEWPEpjDUfkk8BngjWklh0 CsuQ== 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=+v6zqJOiA+FpfR2mYnQoH7Et6N0xcAuxb+eVikBFFsU=; b=LLdAG3pVQLvsSX1lsD04EnCW1lVFt2cyDRVmsRFaIAkCP2JigjdSZ4CJ6H3ZmraAeF P23F5g3wsL+DfOCDt9+YbLRj6Sib1d8FUOaOyhwi1cksO+nk36JC8wJQpcZZp2ByulgQ 27OsgK2ApiylADFFemFL0nfDNLqFEu8C+EuE6gV/dGHpktXphvoxhMLubbZFawUgwkTe WFwhmx2O2ndIpEej5LlHeRdKfwWNTk295H2YQeAqk5481arhBeVU5etAEc4TdMwSo+nE 6CW4GKhIbQG/P/1tbJk9TQBLqtbLfZ60N+ao7ktZWMnpXwNZjge++qdi+a9NvYwgSTAr H2Yg== X-Gm-Message-State: AOAM531kCLEYv8Bwoi3AqUx68sFN1VB6q5NGNzwWAeNcyDJFaOrN/Sw7 ylDect8tR5VfgKLkNZoxiW6NiZUhJhPdVTtZM9fbiA== X-Google-Smtp-Source: ABdhPJxItrgn9YVVgXmHo/EnV6GerfcbBfSOGiAowaV8ybzMaEfyPFAh/p7pcdqKKfKHxbBfZMudb0aBWds3oW0X3+8= X-Received: by 2002:a05:6512:1103:: with SMTP id l3mr18919816lfg.108.1593104924481; Thu, 25 Jun 2020 10:08:44 -0700 (PDT) MIME-Version: 1.0 References: <20200625165547.GA75705@spindle.one-eyed-alien.net> In-Reply-To: <20200625165547.GA75705@spindle.one-eyed-alien.net> From: Sean Chittenden Date: Thu, 25 Jun 2020 10:08:28 -0700 Message-ID: Subject: Re: svn primer translation to git To: Brooks Davis Cc: Ed Maste , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 49t61B55dvz4LKt X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=chittenden.org header.s=8eb15515 header.b=QgjtuBdn; dmarc=pass (policy=none) header.from=chittenden.org; spf=pass (mx1.freebsd.org: domain of sean@chittenden.org designates 2a00:1450:4864:20::12e as permitted sender) smtp.mailfrom=sean@chittenden.org X-Spamd-Result: default: False [-3.11 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.98)[-0.978]; R_DKIM_ALLOW(-0.20)[chittenden.org:s=8eb15515]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; NEURAL_HAM_LONG(-0.99)[-0.987]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[chittenden.org:+]; DMARC_POLICY_ALLOW(-0.50)[chittenden.org,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::12e:from]; NEURAL_HAM_SHORT(-0.14)[-0.140]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 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, 25 Jun 2020 17:08:47 -0000 > > generally follow a process of staging with `git add -p` + `git add` for > new files followed by `git status` and/or `git diff --staged`, and then > `git commit`. > This is a good callout, Brooks. I'm routinely shocked by the number of people who don't know about or use `git add -p` as their muscle-memory way to add something to a commit. We definitely should go out of our way to document best practices. For instance, this has been the workflow that I've worked in or pushed teams to for the last 6yrs and have had decent success: 1. Create Github issue 2. git checkout -b gh-${issue_number} 3. git add -p 4. git status 5. git diff --staged 6. git commit 7. git push -u origin gh-${issue_number} Where `gh-` would be whatever bug-tracking system of choice that you fancy, but it keeps branch naming concise and gives the future reader a hint as to where to look for discussion. While there may be variants of this, we should begin to prescribe a consistent workflow that does not encourage `git commit -a -m "fixedit"` or committing directly to main (svn's fka trunk branch). -sc