emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Matt <matt@excalamus.com>
To: "Ihor Radchenko" <yantar92@posteo.net>
Cc: "emacs-orgmode" <emacs-orgmode@gnu.org>
Subject: How to properly attribute authorship with Git (was Re: [PATCH] lisp/ob-shell.el: Also override explicit-shell-file-name)
Date: Sun, 17 Mar 2024 10:06:08 +0100	[thread overview]
Message-ID: <18e4ba944c6.1071dbb64659068.8617018692679870359@excalamus.com> (raw)
In-Reply-To: <87sf0qiizp.fsf@localhost>

 ---- On Sat, 16 Mar 2024 11:11:38 +0100  Ihor Radchenko  wrote --- 

 > I notice that you changed the commit author and only referenced Aaron in
 > Submitted By: metadata.
 > 
 > 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.

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 <arthur-override's-email>"

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 <the-change>' 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?

--
Matt Trzcinski
Emacs Org contributor (ob-shell)
Learn more about Org mode at https://orgmode.org
Support Org development at https://liberapay.com/org-mode




  reply	other threads:[~2024-03-17  9:07 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-11  5:12 [PATCH] lisp/ob-shell.el: Also override explicit-shell-file-name Aaron L. Zeng
2024-03-11 19:16 ` Matt
2024-03-12 13:29   ` Ihor Radchenko
2024-03-15 21:38     ` Matt
2024-03-15 22:08       ` Aaron Zeng
2024-03-16 10:11       ` Ihor Radchenko
2024-03-17  9:06         ` Matt [this message]
2024-03-17 10:31           ` How to properly attribute authorship with Git (was Re: [PATCH] lisp/ob-shell.el: Also override explicit-shell-file-name) Ihor Radchenko
2024-03-17 13:42             ` Matt
2024-03-17 14:38               ` Ihor Radchenko
2024-03-17 16:26               ` Max Nikulin
2024-03-17 17:32                 ` Matt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=18e4ba944c6.1071dbb64659068.8617018692679870359@excalamus.com \
    --to=matt@excalamus.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=yantar92@posteo.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).