From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id iI6BMJDG9mVYNwAA62LTzQ:P1 (envelope-from ) for ; Sun, 17 Mar 2024 11:31:44 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id iI6BMJDG9mVYNwAA62LTzQ (envelope-from ) for ; Sun, 17 Mar 2024 11:31:44 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=posteo.net header.s=2017 header.b=NESUdLYM; 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"; dmarc=pass (policy=none) header.from=posteo.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710671504; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=aEApokQbDFcTsKYTC64BvGTwErys+Ze1b/ej9yu6KDM=; b=b0H+4kc1IAK9g/B769ggwsH7tTUXRBRr+A7ERmTewLddZB1AHjnLTdfT8B0oE1U1LRUI+I F3s+O7tpSXph9nacAu7Xi+Eb9XZZFhJJ9smxCO7i1xDDNehPn2Son6bMefJHYFOStFve0O cUc+/OQLXZTN/G5x0qKnXpTwHjV+4RA0UUOPHwjG7VT6p3+F6QWeuZgEvgM17B5TS/HfEl 4YOneRFyrK9zKJmKP9/k+ojlzt/kLiPyno2XEttYH4h/J/KNN3qnEo4rWS9Pi+d+Gv0lrI QLqyuef8U60UtTOuijSud2N3F7vMsBA9SJTx+U9HR01ipWpqhsjTK9kB+aXTjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=posteo.net header.s=2017 header.b=NESUdLYM; 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"; dmarc=pass (policy=none) header.from=posteo.net ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710671504; a=rsa-sha256; cv=none; b=CE0jd0TQXwhiuH3GVNSyvyHORh1GBH61WwZU8L8V1ky6DDSlmqUakaHphpzx7JfS65KwWx JuGjAKb6hI5E5USa+jcNPhQ+meym+YVKCuCMie39u3IuNvTNdnY7L+wqlekDMOLEIx3JjA VDU9qjDkrrPRqe9vOHa3thVhfucO2gf+TwKKzpAvilz1nVWOZNIp9COD+9aPPI0AJzIUjU v+IVOL7okkU1kECL+a0oUUuJyaY/4YLJftruCsOeo88h/OyrWljJu7FB868Iut4xUKHad7 K8EG+E1gR0wUmSY6MOPxZEJSUYDjp8KQb6FFeVaj8Rv+8hYGsFThWttLHy92NA== 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 8A2EE50B0D for ; Sun, 17 Mar 2024 11:31:44 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rlnnO-0007yo-UV; Sun, 17 Mar 2024 06:31:14 -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 1rlnnK-0007y7-2B for emacs-orgmode@gnu.org; Sun, 17 Mar 2024 06:31:10 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rlnnH-00082v-2q for emacs-orgmode@gnu.org; Sun, 17 Mar 2024 06:31:08 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id C3B64240028 for ; Sun, 17 Mar 2024 11:31:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1710671464; bh=QFQTZLVmIG9aDFCQTry8v0Kz9YNaEP+8aSKEu5EB9P0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=NESUdLYM6Uew6nO6HMlNtFChrEzK3yWcRkhPb5+TPaCalcwWPal8aiNG+pre3c+rc 6+8PYUk6A+AxNcapWkiIhufx5vi2K6AYMdpkXSDTNbvKHOmtzYBnfPYQ6NQCE4mMEh pwMBjFDPawR38V5w5Wo5bwCxr7ZYpyOJNnQVaWn0m3vaQybtGzGtECZDVasCNI7RtW H2vocCfTobhylAmqaF4fiBRZWstPaxVgm+PKLnFV9zY5Ga1OWb2lCHiym3DdID7JOo p8ojmqHI2Sh9kKQHDA4wBPfr2mc+94Y+p8QSVLvpfY03SLFGfztQgPwRPDFhN7/r7o 7jYct7XdrJkNg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TyDm80Cc4z9rxM; Sun, 17 Mar 2024 11:31:03 +0100 (CET) From: Ihor Radchenko To: Matt Cc: emacs-orgmode Subject: Re: How to properly attribute authorship with Git (was Re: [PATCH] lisp/ob-shell.el: Also override explicit-shell-file-name) In-Reply-To: <18e4ba944c6.1071dbb64659068.8617018692679870359@excalamus.com> 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> Date: Sun, 17 Mar 2024 10:31:00 +0000 Message-ID: <87il1lywt7.fsf@localhost> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=185.67.36.65; envelope-from=yantar92@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-Spam-Score: -9.49 X-Spam-Score: -9.49 X-Migadu-Queue-Id: 8A2EE50B0D X-Migadu-Scanner: mx13.migadu.com X-TUID: Ae1U07u02khN Matt writes: > > For future, we prefer keeping the original commit author in the "author" > > field of the commits - this is important to keep track of the number of > > changed lines for contributors without FSF copyright assignment. > > Thank you for letting me know this is an issue. > > First, would you like me to update the commit? If so, I will need guidance. The correct procedure to change the author after committing to remote 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 the 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 conflict, I think, for someone in the middle of making a change who has not synced with the forced push version and is trying to push their change. 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. > Second, I can update Worg with an explanation that it's important to credit 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 'git' or 'git commit'. However, the following works on my machine and, I guess, is the long option form: > > git commit --author "Arthur Override " You are right. Looks like -A is just Magit shortcut. 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. > Third, this is at least the second time I've had issues working with a diff/patch. The reason I submitted the change the way I did is that I could not get 'git apply ' to work. I only got a useless error like "error: corrupt patch at line 10". It's not clear to me if this is an error on my end or if the patch is indeed ill-formatted. Can you confirm that the submitted patch is well-formatted? There are several types of patches that may need to be applied differently. Plain "diff" patches can be applied using git apply, while maildir/.patch patches can be applied using git am. -- Ihor Radchenko // yantar92, Org mode contributor, Learn more about Org mode at . Support Org development at , or support my work at