From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id AOtjJI3z9mVEaQEA62LTzQ:P1 (envelope-from ) for ; Sun, 17 Mar 2024 14:43:41 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id AOtjJI3z9mVEaQEA62LTzQ (envelope-from ) for ; Sun, 17 Mar 2024 14:43:41 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=excalamus.com header.s=zmail header.b="Dte/S/yo"; dmarc=none; arc=pass ("zohomail.com:s=zohoarc:i=1"); spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=2; s=key1; d=yhetil.org; t=1710683021; a=rsa-sha256; cv=pass; b=Nf48vFYpyxB56QUq6s6GpkGUtM6HOJo/9lWUGaQkzJVlz4zcMTGWPrFnt7tCIixgiFZinj TKyan2ol20HMmmCCaJGyNREcNe2ObaMngaRvx7g0Up+0Hnvfeh6GuuwnXVkgFXNwJPi8Pf 1psjLisLBM4n9oMYCVxt7fxYDrh2EQn/et2S5adfOVJfaDT0qiG21ssd+91Phdyac2x0b0 NMMTf0cVLLyvQ0OYT73do4oFGbsAF6lS4QmcT0zFKP9nPkVy1hM2IrepX/3ZgJgXewTQfw 92fnT/6+oFO9/YJKEFneTzayM+uhx8h7w2e+yOFGe2MMR6QkAyEBD5lbelJYHw== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=pass header.d=excalamus.com header.s=zmail header.b="Dte/S/yo"; dmarc=none; arc=pass ("zohomail.com:s=zohoarc:i=1"); spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710683021; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=mnvJx4pnFULi9kDmeyQiWqKy8l+KWyTQXp5c3a30aZg=; b=Lq+0CYElTCjp8CqCKfC33y0FSmCz7PAH2roMPJXUzHIVB+CCXu22180E1/18UVTST5pyjk XkmSYRLx2c0+QLTtZUZPsLLr2yjBN1ti46tZ3woBJMxzTiY7hL2+Mh6QN6jIea0VToXQ6E pdSzd1svs9o5fBCqEfZqSRMxTXHCM1nYU3zrSHpHQQcVDGgbc+GoEFdaLa4mesbOlkjNxJ 110ya3ITCRVDBPG6g3qOgHL8MCIpGV8QDSjgljYk8dTFT+FCGhN8yuDbPhQffOYww4SpJX 1jS0VFFoiukWf3U/hKG9Sh9ZNNkxSwCOk7usuTc+4t38FveDltcx0fr/6cZWBQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2655ECF96 for ; Sun, 17 Mar 2024 14:43:41 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rlqmd-00055w-NN; Sun, 17 Mar 2024 09:42:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rlqma-00052p-Ei for emacs-orgmode@gnu.org; Sun, 17 Mar 2024 09:42:36 -0400 Received: from sender4-pp-f112.zoho.com ([136.143.188.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rlqmY-0000Fl-Kh for emacs-orgmode@gnu.org; Sun, 17 Mar 2024 09:42:36 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1710682950; cv=none; d=zohomail.com; s=zohoarc; b=nncBIxe8c3/a/KHdXxsN6VgmhkS5J1poTmSWofhUXlhCZUJtl/lokr0n4iRZPuAJptAGKy1lgUgSUictcL6FBUkpdxgcRD9br9pbiYgvZ8Q5YjfvkTZeAFasgIKL53xvPCCyrCW71nrizy16oSlgJSQngxW142xQyywmcb0UpvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710682950; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=mnvJx4pnFULi9kDmeyQiWqKy8l+KWyTQXp5c3a30aZg=; b=lqutiQ87d2/xC5TYqPTVzUyRFnKtP6bY/uAXPkQSiDFmG9OmzWJYK/Whcu9frfOG1BaoYeN5ZVDw51ad751hlBcK8majzT7afX3kzYfW0Uzhh9yDITOY5ky2IK0Dqro2v7NlHFIt3uOrqLa9lK3AV9d1PXiVMTWpveJ7CermU0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=excalamus.com; spf=pass smtp.mailfrom=matt@excalamus.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1710682950; s=zmail; d=excalamus.com; i=matt@excalamus.com; h=Date:Date:From:From:To:To:Cc:Cc:Message-ID:In-Reply-To:References:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=mnvJx4pnFULi9kDmeyQiWqKy8l+KWyTQXp5c3a30aZg=; b=Dte/S/yoGdxwURBjg2eDe1vKR89Y9+BmVmcJlHq2eD/u/F2oQPz13FLM9/EkroxF RBSOPclhLOzgXAZPI7NBlzIl1HjKBYLDzb0ga0JuQ98bzIoSD7RaGBhL07EoOhu43Z6 sM1Ny72V1LeHdB+LKt7pJqsI/6jtpOrEKzamJrMA= Received: from mail.zoho.com by mx.zohomail.com with SMTP id 1710682949498340.7699188568773; Sun, 17 Mar 2024 06:42:29 -0700 (PDT) Date: Sun, 17 Mar 2024 14:42:29 +0100 From: Matt To: "Ihor Radchenko" Cc: "emacs-orgmode" Message-ID: <18e4ca6475b.dcb5ca35676861.167671948872676263@excalamus.com> In-Reply-To: <87il1lywt7.fsf@localhost> References: <20240311051313.3490020-1-me@bcc32.com> <18e2ef220a9.b5a8c7ae44361.2739966878741459645@excalamus.com> <87jzm7d1du.fsf@localhost> <18e440cec8c.d2bfc741504486.3314999848804225927@excalamus.com> <87sf0qiizp.fsf@localhost> <18e4ba944c6.1071dbb64659068.8617018692679870359@excalamus.com> <87il1lywt7.fsf@localhost> Subject: Re: How to properly attribute authorship with Git (was Re: [PATCH] lisp/ob-shell.el: Also override explicit-shell-file-name) MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Importance: Medium User-Agent: Zoho Mail X-Mailer: Zoho Mail Received-SPF: pass client-ip=136.143.188.112; envelope-from=matt@excalamus.com; helo=sender4-pp-f112.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -10.22 X-Spam-Score: -10.22 X-Migadu-Queue-Id: 2655ECF96 X-TUID: DGApUni8+h6Y ---- On Sun, 17 Mar 2024 11:31:00 +0100 Ihor Radchenko wrote ---=20 > Matt matt@excalamus.com> writes: > > > First, would you like me to update the commit? If so, I will need gui= dance. The correct procedure to change the author after committing to remo= te is unclear to me. I would think it's something like sync my local copy = with the latest remote version, update the author locally, and force push t= he change. I would then expect that the next time someone pulls, it would = update their local with the author change. It would, however, cause a conf= lict, I think, for someone in the middle of making a change who has not syn= ced with the forced push version and is trying to push their change. >=20 > We should avoid force pushing unless something is terribly broken. > What you may do instead is (1) revert the commit; (2) re-apply the > commit version with the correct author attribution. Done. For the benefit of future me or anyone else who cares, I did: 1. git revert 2. make changes (e.g. emacs followed by *type-t= ype-type* or some incantation of 'git apply' or 'git am') 3. git commit --author "Arthur Author " 4. git push 'git revert', in this case, basically swaps the plus and minus signs in the= diff for the specified commit and submits that as a new set of changes. A= fter applying those changes, it's possible, in this case, to proceed with "= what you should have done in the first place". > > Second, I can update Worg with an explanation that it's important to c= redit authors using git's author field and how to do this. Unless I missed= it, worg/org-contribute makes no mention of the author field. The version= of git packaged by my distro is 2.41.0 and, AFAICT, has no -A flag for 'gi= t' or 'git commit'. However, the following works on my machine and, I gues= s, is the long option form: > > > > git commit --author "Arthur Override " >=20 > You are right. Looks like -A is just Magit shortcut. >=20 > As for crediting authors, we may document it in https://orgmode.org/worg= /org-maintenance.html#copyright > Although, it is under "core maintainer" section. Maybe we can make a > dedicated section for maintainers on how to deal with patch submissions. I added a little section within copyright: https://git.sr.ht/~bzg/worg/comm= it/80152bee771b755aedfbe488497c5e4d0e7457c2 -- Matt Trzcinski Emacs Org contributor (ob-shell) Learn more about Org mode at https://orgmode.org Support Org development at=C2=A0https://liberapay.com/org-mode