From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id eGHvCcJjuGLxpQAAbAwnHQ (envelope-from ) for ; Sun, 26 Jun 2022 15:48:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id eHnxCMJjuGL3NQEAG6o9tA (envelope-from ) for ; Sun, 26 Jun 2022 15:48:50 +0200 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 A9E5C3EEC9 for ; Sun, 26 Jun 2022 15:48:49 +0200 (CEST) Received: from localhost ([::1]:33216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5Sd6-0008Ul-Cx for larch@yhetil.org; Sun, 26 Jun 2022 09:48:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5ScE-0008Ud-II for emacs-orgmode@gnu.org; Sun, 26 Jun 2022 09:47:54 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:55913) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o5ScD-0000Ou-2A for emacs-orgmode@gnu.org; Sun, 26 Jun 2022 09:47:54 -0400 Received: by mail-wm1-x32f.google.com with SMTP id f190so3585117wma.5 for ; Sun, 26 Jun 2022 06:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:references:gmane-reply-to-list:date:in-reply-to :message-id:mime-version:content-transfer-encoding; bh=pV4bV+O4Rkl7n4QpCjzMPdjZCwbh5wrUMJUdyXsvlhQ=; b=Gmll16lv5xjfwIN8u/mXeLU+akNqnuPoa+XGO5RR975hrhqQ7vIFcj07G18lnHuMX5 4e/wVFo3WxD31SRKoV7Ph71jlvSd4MUNIQVwgBjoz1V6OwAIkpqwavMNY0luMV4Dfz6S RZpAnxFPAAkH0ppxmtpkoql0xg6scc1IUyWvfKNsXMIjw6REowDhh10f4xCN5YOAABb+ /+jyES0X/pF/FEcgQmwjQH38NEc38ts6OqdE5rRHF+6pCv6FBSx7bENAAWklW5cEcZil 1FY6rIgUVYtVuQwaIR7W66Z6p/rL2xkWa5mmC8w9Pz1T8SWtnpByxOCutUTH58qPa04U aiRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:references:gmane-reply-to-list :date:in-reply-to:message-id:mime-version:content-transfer-encoding; bh=pV4bV+O4Rkl7n4QpCjzMPdjZCwbh5wrUMJUdyXsvlhQ=; b=h950gYAWX6jrmH0yist7cYQKlLCc/vh6mwxgP6waWLZ8CznSQl+qajQTIH11/7YdPR t9+URoBa+WG6nfPdiXufk5mCdEYKH2ms4W7siTTynMTbn4dlWMKnE5MtJjWisaiZFkhf dVQvZaqiYecDfk3pL1ZGcMb6VL/T7OBw0M6haQJiZFMNwBM5mrqCeRIvLEeL8DNjdVUq TZIH8DWZqxLWa8Olk5ipOU3EQStNr7beJODQ8luaboZ3zH7SmcTTDrEOe19B437spr2t UHqHrrZledqhNE4y4Wn+peiPaJc2xYeP1VrvK5oFz/0PkH+keXpKeMoXl4Q/cDAtDAFc ietQ== X-Gm-Message-State: AJIora+87XbUxSp68F+RHpjNJf8fgwhiVhYSM9SZsyB99JXQ8N80h4t4 eZr7c4PF4YW/yEG1saRrjEhEK0P3WLg= X-Google-Smtp-Source: AGRyM1sUOll4FmhTqk1fUwjYH7Yx/0DSYODYNUSJS5mm1PK0PNLG80nfA+SV1oVuudgwHmu/QsfyMA== X-Received: by 2002:a1c:f20b:0:b0:39e:f4b9:24e3 with SMTP id s11-20020a1cf20b000000b0039ef4b924e3mr9776806wmc.51.1656251270888; Sun, 26 Jun 2022 06:47:50 -0700 (PDT) Received: from rltb ([2a01:e0a:3f3:fb50:c1a6:7d68:210a:3b8d]) by smtp.gmail.com with ESMTPSA id t18-20020a5d42d2000000b0021a56cda047sm7603769wrr.60.2022.06.26.06.47.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jun 2022 06:47:50 -0700 (PDT) From: Robert Pluim To: emacs-orgmode@gnu.org Subject: [PATCH] describe how to override Author References: <87wng5nno3.fsf@localhost-Mzo7eKN----2> <87iloqw5bq.fsf@gmail.com> <87edzew1fx.fsf@gmail.com> <875ykpv2nu.fsf@localhost> <877d53wxdi.fsf@gmail.com> Gmane-Reply-To-List: yes Date: Sun, 26 Jun 2022 15:47:49 +0200 In-Reply-To: <877d53wxdi.fsf@gmail.com> (Robert Pluim's message of "Sun, 26 Jun 2022 12:08:09 +0200") Message-ID: <87tu87v8my.fsf_-_@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=rpluim@gmail.com; helo=mail-wm1-x32f.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1656251329; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=pV4bV+O4Rkl7n4QpCjzMPdjZCwbh5wrUMJUdyXsvlhQ=; b=ijgkeueIa/Os0i+E1YODQLgUK5CJwlbj3xDZYmu849AdX06mGcLu7gws7vnPMbQO1p/7ue 3KB5kHeNf1CXp6j5rSD+gFnkyvGalGI9k2de6zNqiKL2Iu9aaI+5ooNetYeHm9VO6QiI34 DhE0yraXBq6REIGwSZo/XwF9W2W7XHNe+rP8KQ1Q7kAdI4aAqesBJCaiobz5QLBxeAZ62A Ib/yqqn01xmJ6KbD7mBXN5l2IhUqAHp1Gl+ucrkpk3mWfFK8Muj61swiLQD3KJGiscixCL YIR95TD84Y6GzTy9c0nWFJLvxVzE4zm15Ch46q3iSwqN0VzoiCsstg1amcH/0w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1656251329; a=rsa-sha256; cv=none; b=NMgIak021BHh8g81fkpC3mlR7vwEA4XhW4j1mJYPWBWYPicjaz26j0GFtFjfKk1Yi03eDj cn2ET53kK8zYhp8DvegW1ZONwyeLieqVrR/UIBi0XsQECZqtj9mCy1j1WGMUm0w9fMcgRY QoAIzbiAt6tWW+xvHF/MQjYeJ2fQe5heSmala0WpptMcUeGfS8ZoEj7tVC69s7tz+g28Ml CyFF8p4yEvrgXP6kdSp0Yvp/iS41MtzPqtKHGiyQLjlL1vAI8oDnodooMdsHFSjXDurYQt MWPN3LguC3cKNpMo0NbtGe6FILLCoe9z9j5jcWzwNJnqosTE6n4FMeWz1CE3yQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Gmll16lv; dmarc=pass (policy=none) header.from=gmail.com; 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" X-Migadu-Spam-Score: -2.46 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=Gmll16lv; dmarc=pass (policy=none) header.from=gmail.com; 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" X-Migadu-Queue-Id: A9E5C3EEC9 X-Spam-Score: -2.46 X-Migadu-Scanner: scn1.migadu.com X-TUID: 5OuhuNLvlbxc Robert> The thing that=CA=BCs missing is any discussion of how to ensur= e the Author Robert> of the commit is set correctly. When applying git patches it all Robert> works, but not when applying diffs. I=CA=BCll read through the Robert> org-contribute section and see if I can come up with some verbi= age. Something like this? (I hope I=CA=BCve got the syntax right, I seldom write org for exporting purposes). The emacs CONTRIBUTE guidelines talk about setting 'Author', but I guess not everyone reads those... diff --git a/org-contribute.org b/org-contribute.org index a3cb6f2b..c01bf417 100644 --- a/org-contribute.org +++ b/org-contribute.org @@ -270,6 +270,19 @@ * Your first commit as an Org maintainer locally and make sure you have a clean commit history before merging it into the =3Dbugfix=3D or =3Dmain=3D branch. =20 +When applying patches written by other people, please ensure that the +=3DAuthor=3D information of the resulting commit(s) is correct. When +applying patches created with =3Dgit format-patch=3D this will happen +automatically, but when applying simple diffs you will need to +override the author. Here are three ways to do that, depending on +which method you use to commit to git: + +1. Command line: src_sh{git commit --author=3D'First Last '} +2. =3DVC=3D: Set the 'Author:' field in log-edit mode (requires setting + `log-edit-setup-add-author'). +3. =3DMagit=3D: Override the author using the =3D-A=3D flag from magit's c= ommit + transient. + To check our Git workflow in more details, please read [[file:org-maintena= nce.org][Org maintenance]]. =20 * Commit messages and ChangeLog entries