all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Ihor Radchenko <yantar92@posteo.net>
To: Matt <matt@excalamus.com>
Cc: emacs-orgmode <emacs-orgmode@gnu.org>
Subject: Re: 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:31:00 +0000	[thread overview]
Message-ID: <87il1lywt7.fsf@localhost> (raw)
In-Reply-To: <18e4ba944c6.1071dbb64659068.8617018692679870359@excalamus.com>

Matt <matt@excalamus.com> 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 <arthur-override's-email>"

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 <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?

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 <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>


  reply	other threads:[~2024-03-17 10:31 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         ` How to properly attribute authorship with Git (was Re: [PATCH] lisp/ob-shell.el: Also override explicit-shell-file-name) Matt
2024-03-17 10:31           ` Ihor Radchenko [this message]
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

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

  git send-email \
    --in-reply-to=87il1lywt7.fsf@localhost \
    --to=yantar92@posteo.net \
    --cc=emacs-orgmode@gnu.org \
    --cc=matt@excalamus.com \
    /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 external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.