subtree: support GPG commit signing #1490
Conversation
Welcome to GitGitGadgetHi @areese, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests. Please make sure that your Pull Request has a good description, as it will be used as cover letter. You can CC potential reviewers by adding a footer to the PR description with the following syntax: Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:
It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code. Contributing the patchesBefore you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form Both the person who commented An alternative is the channel Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment If you want to see what email(s) would be sent for a After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail). If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the curl -g --user "<EMailAddress>:<Password>" \
--url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txtTo iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description): To send a new iteration, just add another PR comment with the contents: Need help?New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join. You may also be able to find help in real time in the developer IRC channel, |
|
There are issues in commit 777d868: |
areese
force-pushed
the
git-subtree-support-gpg-signing
branch
from
777d868
to
ffbdcf9
Compare
|
/allow |
|
User areese is now allowed to use GitGitGadget. WARNING: areese has no public email address set on GitHub; |
|
This has a bug, the merge is missing gpg-sign, I need to update it. |
|
There are issues in commit 2927127: |
|
/submit |
|
There are issues in commit 2927127: |
areese
force-pushed
the
git-subtree-support-gpg-signing
branch
from
2927127
to
760abe7
Compare
|
trying this again after fixing the commit message. /preview |
|
There are issues in commit 08a2607: |
areese
force-pushed
the
git-subtree-support-gpg-signing
branch
2 times, most recently
from
66a5c1b
to
8a30d1f
Compare
|
There are issues in commit 8a30d1f: |
areese
force-pushed
the
git-subtree-support-gpg-signing
branch
from
8a30d1f
to
6c15783
Compare
|
There are issues in commit 6c15783: |
areese
force-pushed
the
git-subtree-support-gpg-signing
branch
from
6c15783
to
01d69fc
Compare
|
/allow |
|
Error: User K021 is not yet permitted to use GitGitGadget |
|
/preview |
|
Preview email sent as pull.1490.git.git.1681145845.gitgitgadget@gmail.com |
|
/submit |
|
Submitted as pull.1490.git.git.1681146107.gitgitgadget@gmail.com To fetch this version into To fetch this version to local tag |
![gitgitgadget-git[bot]](https://avatars.githubusercontent.com/in/46807?s=60&v=4){kind=small}
| @@ -46,6 +46,8 @@ rejoin merge the new branch back into HEAD | |||
| options for 'add' and 'merge' (also: 'pull', 'split --rejoin', and 'push --rejoin') | |||
There was a problem hiding this comment.
On the Git mailing list, Allen Reese wrote (reply to this):
Adding Avery, as I don’t seem to have managed to cc Avery as part of the gitgadet pr.
> On Apr 10, 2023, at 10:01 AM, Jacques Vidrine via GitGitGadget <gitgitgadget@gmail.com> wrote:
>
> From: Jacques Vidrine <t@fboundp.com>
>
> Add support for -S/--gpg-sign/--no-gpg-sign command line options
> and commit.gpgsign configuration. These are passed to invocations
> of `git commit-tree`.
>
> Signed-off-by: Allen Reese <java.allen@apple.com>
> Signed-off-by: Jacques Vidrine <t@fboundp.com>
> ---
> contrib/subtree/git-subtree.sh | 24 +++++++++++++++++++-----
> contrib/subtree/git-subtree.txt | 9 +++++++++
> 2 files changed, 28 insertions(+), 5 deletions(-)
>
> diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
> index 10c9c87839a..553b4391deb 100755
> --- a/contrib/subtree/git-subtree.sh
> +++ b/contrib/subtree/git-subtree.sh
> @@ -46,6 +46,8 @@ rejoin merge the new branch back into HEAD
> options for 'add' and 'merge' (also: 'pull', 'split --rejoin', and 'push --rejoin')
> squash merge subtree changes as a single commit
> m,message= use the given message as the commit message for the merge commit
> +S,gpg-sign? GPG-sign commits, optionally specifying keyid.
> +no-gpg-sign Disable GPG commit signing.
> "
>
> indent=0
> @@ -165,6 +167,7 @@ main () {
> arg_quiet=
> arg_debug=
> arg_prefix=
> + arg_gpgsign=
> arg_split_branch=
> arg_split_onto=
> arg_split_ignore_joins=
> @@ -240,6 +243,9 @@ main () {
> test -n "$allow_addmerge" || die_incompatible_opt "$opt" "$arg_command"
> arg_addmerge_squash=
> ;;
> + -S*|--gpg-sign=*|--no-gpg-sign)
> + arg_gpgsign="${opt}"
> + ;;
> --)
> break
> ;;
> @@ -268,6 +274,12 @@ main () {
>
> dir="$(dirname "$arg_prefix/.")"
>
> + if test -z "$arg_gpgsign" &&
> + git config --bool commit.gpgsign >/dev/null
> + then
> + arg_gpgsign="-S"
> + fi
> +
> debug "command: {$arg_command}"
> debug "quiet: {$arg_quiet}"
> debug "dir: {$dir}"
> @@ -534,7 +546,7 @@ copy_commit () {
> printf "%s" "$arg_split_annotate"
> cat
> ) |
> - git commit-tree "$2" $3 # reads the rest of stdin
> + git commit-tree $arg_gpgsign "$2" $3 # reads the rest of stdin
> ) || die "fatal: can't copy commit $1"
> }
>
> @@ -674,10 +686,10 @@ new_squash_commit () {
> if test -n "$old"
> then
> squash_msg "$dir" "$oldsub" "$newsub" |
> - git commit-tree "$tree" -p "$old" || exit $?
> + git commit-tree $arg_gpgsign "$tree" -p "$old" || exit $?
> else
> squash_msg "$dir" "" "$newsub" |
> - git commit-tree "$tree" || exit $?
> + git commit-tree $arg_gpgsign "$tree" || exit $?
> fi
> }
>
> @@ -900,11 +912,13 @@ cmd_add_commit () {
> then
> rev=$(new_squash_commit "" "" "$rev") || exit $?
> commit=$(add_squashed_msg "$rev" "$dir" |
> - git commit-tree "$tree" $headp -p "$rev") || exit $?
> + git commit-tree $arg_gpgsign "$tree" \
> + $headp -p "$rev") || exit $?
> else
> revp=$(peel_committish "$rev") || exit $?
> commit=$(add_msg "$dir" $headrev "$rev" |
> - git commit-tree "$tree" $headp -p "$revp") || exit $?
> + git commit-tree $arg_gpgsign "$tree" \
> + $headp -p "$revp") || exit $?
> fi
> git reset "$commit" || exit $?
>
> diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
> index 004abf415b8..fa54541b288 100644
> --- a/contrib/subtree/git-subtree.txt
> +++ b/contrib/subtree/git-subtree.txt
> @@ -185,6 +185,15 @@ subproject.
> --message=<message>::
> Specify <message> as the commit message for the merge commit.
>
> +-S[<keyid>]::
> +--gpg-sign[=<keyid>]::
> +--no-gpg-sign::
> + GPG-sign commits. The `keyid` argument is optional and
> + defaults to the committer identity; if specified, it must be
> + stuck to the option without a space. `--no-gpg-sign` is useful to
> + countermand both `commit.gpgSign` configuration variable, and
> + earlier `--gpg-sign`.
> +
> OPTIONS FOR 'split' (ALSO: 'push')
> ----------------------------------
> These options for 'split' may also be given to 'push' (which wraps
> --
> gitgitgadget
>
areese
force-pushed
the
git-subtree-support-gpg-signing
branch
from
01d69fc
to
de879d2
Compare
Add support for -S/--gpg-sign/--no-gpg-sign command line options and commit.gpgsign configuration. These are passed to invocations of `git commit-tree`. Signed-off-by: Allen Reese <java.allen@apple.com> Signed-off-by: Jacques Vidrine <t@fboundp.com>
Replace immitate -> imitate. cc: Avery apenwarr@gmail.com Signed-off-by: Allen Reese <allen_reese@apple.com>
areese
force-pushed
the
git-subtree-support-gpg-signing
branch
from
de879d2
to
6a39f46
Compare
Add support for -S/--gpg-sign/--no-gpg-sign command line options and commit.gpgsign configuration. These are passed to invocations of
git commit-tree.cc: Avery apenwarr@gmail.com
Thanks for taking the time to contribute to Git! Please be advised that the
Git community does not use github.com for their contributions. Instead, we use
a mailing list (git@vger.kernel.org) for code submissions, code reviews, and
bug reports. Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
to conveniently send your Pull Requests commits to our mailing list.
Please read the "guidelines for contributing" linked above!