From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: git@vger.kernel.org
Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Dominic Chen" <d.c.ddcc@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Martin Ågren" <martin.agren@gmail.com>
Subject: [PATCH v3 0/6] Honour and Document --no-gpg-sign
Date: Fri, 3 Apr 2020 17:28:01 +0700 [thread overview]
Message-ID: <cover.1585909453.git.congdanhqx@gmail.com> (raw)
In-Reply-To: <20200331064456.GA15850@danh.dev>
The subcommand `git commit` supports a `--no-gpg-sign` argument, which is
useful incases where e.g. a GPG key is specified in `.gitconfig`,
but is located on a hardware key that may not currently be attached to
the system.
Multiple commands that understand --gpg-sign but haven't understand
--no-gpg-sign, yet.
Also, document more commands that honours --no-gpg-sign
Change in v3 since v2:
- Use `backticks` instead of "dquote" for options
- Add missing "--no-gpg-sign::"
- Merge git-commit-tree --[no-]gpg-sign"
Change in v2 since v1:
- FREE_AND_NULL as soon as possible
- update test code for rebase --no-gpg-sign
- revert (--edit which is default in tty) now honours --no-gpg-sign
- cherry-pick --edit now honours --no-gpg-sign
- add more documentation
Đoàn Trần Công Danh (6):
rebase.c: honour --no-gpg-sign
cherry-pick/revert: honour --no-gpg-sign in all case
Documentation: document am --no-gpg-sign
Documentation: reword commit --no-gpg-sign
Documentation: merge commit-tree --[no-]gpg-sign
Documentation: document merge option --no-gpg-sign
Documentation/git-am.txt | 5 +-
Documentation/git-cherry-pick.txt | 5 +-
Documentation/git-commit-tree.txt | 8 ++-
Documentation/git-commit.txt | 9 ++--
Documentation/git-rebase.txt | 5 +-
Documentation/git-revert.txt | 5 +-
Documentation/merge-options.txt | 5 +-
builtin/rebase.c | 7 +--
sequencer.c | 2 +
t/t3435-rebase-gpg-sign.sh | 71 +++++++++++++++++++++++++
t/t3514-cherry-pick-revert-gpg.sh | 86 +++++++++++++++++++++++++++++++
11 files changed, 190 insertions(+), 18 deletions(-)
create mode 100755 t/t3435-rebase-gpg-sign.sh
create mode 100755 t/t3514-cherry-pick-revert-gpg.sh
Range-diff against v2:
1: b886c69e92 ! 1: b601c99f7b rebase.c: honour --no-gpg-sign
@@ Metadata
## Commit message ##
rebase.c: honour --no-gpg-sign
- Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
-
## Documentation/git-rebase.txt ##
@@ Documentation/git-rebase.txt: See also INCOMPATIBLE OPTIONS below.
@@ Documentation/git-rebase.txt: See also INCOMPATIBLE OPTIONS below.
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.
-+ stuck to the option without a space. "--no-gpg-sign" is useful to
++ stuck to the option without a space. `--no-gpg-sign` is useful to
+ countermand both `commit.gpgSign` configuration variable, and
-+ earlier "--gpg-sign".
++ earlier `--gpg-sign`.
-q::
--quiet::
2: e1b6d7866d ! 2: 28ebbfe72a cherry-pick/revert: honour --no-gpg-sign in all case
@@ Documentation/git-cherry-pick.txt: effect to your index in a row.
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.
-+ stuck to the option without a space. "--no-gpg-sign" is useful to
++ stuck to the option without a space. `--no-gpg-sign` is useful to
+ countermand both `commit.gpgSign` configuration variable, and
-+ earlier "--gpg-sign".
++ earlier `--gpg-sign`.
--ff::
If the current HEAD is the same as the parent of the
@@ Documentation/git-revert.txt: effect to your index in a row.
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.
-+ stuck to the option without a space. "--no-gpg-sign" is useful to
++ stuck to the option without a space. `--no-gpg-sign` is useful to
+ countermand both `commit.gpgSign` configuration variable, and
-+ earlier "--gpg-sign".
++ earlier `--gpg-sign`.
-s::
--signoff::
3: 9cc14b52e4 < -: ---------- Documentation: document am --no-gpg-sign
4: 801750016e < -: ---------- Documentation: reword commit --no-gpg-sign
-: ---------- > 3: 340374fb68 Documentation: document am --no-gpg-sign
-: ---------- > 4: 1b952f7348 Documentation: reword commit --no-gpg-sign
-: ---------- > 5: 685832b069 Documentation: merge commit-tree --[no-]gpg-sign
5: 857178defd ! 6: b1a3d42355 Documentation: document merge option --no-gpg-sign
@@ Documentation/merge-options.txt: When not possible, refuse to merge and exit wit
GPG-sign the resulting merge commit. The `keyid` argument is
optional and defaults to the committer identity; if specified,
- it must be stuck to the option without a space.
-+ it must be stuck to the option without a space. "--no-gpg-sign"
++ 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".
++ and earlier `--gpg-sign`.
--log[=<n>]::
--no-log::
--
2.26.0.334.g6536db25bb
next prev parent reply other threads:[~2020-04-03 10:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 20:03 Support for `--no-gpg-sign` in git rebase, cherry-pick, etc Dominic Chen
2020-03-31 6:44 ` [PATCH] rebase.c: teach --no-gpg-sign to git-rebase Danh Doan
2020-04-01 17:47 ` Junio C Hamano
2020-04-02 1:09 ` Danh Doan
2020-04-02 10:15 ` [PATCH v2 0/5] Honour and Document --no-gpg-sign Đoàn Trần Công Danh
2020-04-02 10:15 ` [PATCH v2 1/5] rebase.c: honour --no-gpg-sign Đoàn Trần Công Danh
2020-04-03 5:21 ` Martin Ågren
2020-04-02 10:15 ` [PATCH v2 2/5] cherry-pick/revert: honour --no-gpg-sign in all case Đoàn Trần Công Danh
2020-04-02 10:15 ` [PATCH v2 3/5] Documentation: document am --no-gpg-sign Đoàn Trần Công Danh
2020-04-02 10:15 ` [PATCH v2 4/5] Documentation: reword commit --no-gpg-sign Đoàn Trần Công Danh
2020-04-02 10:15 ` [PATCH v2 5/5] Documentation: document merge option --no-gpg-sign Đoàn Trần Công Danh
2020-04-02 18:07 ` Junio C Hamano
2020-04-03 0:25 ` Danh Doan
2020-04-03 10:28 ` Đoàn Trần Công Danh [this message]
2020-04-03 10:28 ` [PATCH v3 1/6] rebase.c: honour --no-gpg-sign Đoàn Trần Công Danh
2020-04-03 10:28 ` [PATCH v3 2/6] cherry-pick/revert: honour --no-gpg-sign in all case Đoàn Trần Công Danh
2020-04-03 13:43 ` Phillip Wood
2020-04-03 14:26 ` Danh Doan
2020-04-03 10:28 ` [PATCH v3 3/6] Documentation: document am --no-gpg-sign Đoàn Trần Công Danh
2020-04-03 10:28 ` [PATCH v3 4/6] Documentation: reword commit --no-gpg-sign Đoàn Trần Công Danh
2020-04-03 10:28 ` [PATCH v3 5/6] Documentation: merge commit-tree --[no-]gpg-sign Đoàn Trần Công Danh
2020-04-03 10:28 ` [PATCH v3 6/6] Documentation: document merge option --no-gpg-sign Đoàn Trần Công Danh
2020-04-03 18:40 ` [PATCH v3 0/6] Honour and Document --no-gpg-sign Junio C Hamano
2020-04-04 14:36 ` Martin Ågren
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=cover.1585909453.git.congdanhqx@gmail.com \
--to=congdanhqx@gmail.com \
--cc=d.c.ddcc@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.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.
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.