From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] commit-tree: do not pay attention to commit.gpgsign
Date: Tue, 3 May 2016 00:12:57 -0400 [thread overview]
Message-ID: <20160503041256.GA30529@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqlh3sqfze.fsf@gitster.mtv.corp.google.com>
On Mon, May 02, 2016 at 02:58:45PM -0700, Junio C Hamano wrote:
> ba3c69a9 (commit: teach --gpg-sign option, 2011-10-05) introduced a
> "signed commit" by teaching --[no-gpg-sign option and commit.gpgsign
> configuration variable to various commands that create commits.
>
> Teaching these to "git commit" and "git merge", both of which are
> end-user facing Porcelain commands, was perfectly fine. Allowing
> the plumbing "git commit-tree" to suddenly change the behaviour to
> surprise the scripts by paying attention to commit.gpgsign was not.
>
> Among the in-tree scripts, filter-branch, quiltimport, rebase and
> stash are the commands that run "commit-tree". If any of these
> wants to allow users to always sign every single commit, they should
> offer their own configuration (e.g. "filterBranch..gpgsign") with an
> option to disable (e.g. "git filter-branch --no-gpgsign").
>
> Ignoring commit.gpgsign option _obviously_ breaks the backward
> compatibility, but I seriously doubt anybody sane is depending on
> this misfeature that commit-tree blindly follows commit.gpgsign in
> any third-party script that calls it.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>
> * This is an simpler alternative that forces commit-tree callers
> that want to honor commit.gpgsign to do so themselves.
I don't have any such scripts myself (aside from git-stash, whose
signing behavior is moderately annoying), but I think this simpler form
is fine. There is already an escape hatch for scripts, and it is:
if test "$(git config --bool commit.gpgsign)" = "true"; then
sign=-S
else
sign=
fi
git commit-tree $sign ...
That is a few more lines than "--use-commit-gpgsign-config", but it's
simple enough to be acceptable, and matches the same technique that
other config options need when used with plumbing.
So I think the motivation and premise are good, but...
> -static int commit_tree_config(const char *var, const char *value, void *cb)
> -{
> - int status = git_gpg_config(var, value, NULL);
> - if (status)
> - return status;
> - if (!strcmp(var, "commit.gpgsign")) {
> - sign_commit = git_config_bool(var, value) ? "" : NULL;
> - return 0;
> - }
> - return git_default_config(var, value, cb);
> -}
> -
I think this may be going too far. If I do "git commit-tree -S", I'd
expect it to use gpg.program, but here you are dropping the call to
git_gpg_config. Likewise for user.signingkey.
So I think you just want to drop the commit.gpgsign block here, and keep
the rest.
-Peff
next prev parent reply other threads:[~2016-05-03 4:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 21:58 [PATCH] commit-tree: do not pay attention to commit.gpgsign Junio C Hamano
2016-05-03 4:12 ` Jeff King [this message]
2016-05-03 18:01 ` Re* " Junio C Hamano
2016-05-03 18:58 ` Jeff King
-- strict thread matches above, loose matches on Subject: below --
2016-05-02 21:59 Junio C Hamano
2016-05-03 4:20 ` Eric Sunshine
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160503041256.GA30529@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 public inbox
https://80x24.org/mirrors/git.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).