From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v1 7/8] sequencer: load commit related config
Date: Tue, 7 Nov 2017 02:02:08 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.21.1.1711070202040.6482@virtualbox> (raw)
In-Reply-To: <20171106112709.2121-8-phillip.wood@talktalk.net>
Hi Phillip,
On Mon, 6 Nov 2017, Phillip Wood wrote:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> Load default values for message cleanup and gpg signing of commits in
> preparation for committing without forking 'git commit'.
Nicely explained.
> diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
> index f8519363a393862b6857acab037e74367c7f2134..68194d3aed950f327a8bc624fa1991478dfea01e 100644
> --- a/builtin/rebase--helper.c
> +++ b/builtin/rebase--helper.c
> @@ -9,6 +9,17 @@ static const char * const builtin_rebase_helper_usage[] = {
> NULL
> };
>
> +static int git_rebase_helper_config(const char *k, const char *v, void *cb)
> +{
> + int status;
> +
> + status = git_sequencer_config(k, v, NULL);
> + if (status)
> + return status;
> +
> + return git_default_config(k, v, NULL);
It's more a matter of taste than anything else, but this one would be a
little bit shorter:
return git_sequencer_config(k, v, NULL) ||
git_default_config(k, v, NULL);
A more important question would be whether this `git_default_config()`
call could be folded into `git_sequencer_config()` right away, so that the
same pattern does not have to be repeated in rebase--helper as well as in
revert/cherry-pick.
> diff --git a/builtin/revert.c b/builtin/revert.c
> index b9d927eb09c9ed87c84681df1396f4e6d9b13c97..b700dc7f7fd8657ed8cd2450a8537fe98371783f 100644
> --- a/builtin/revert.c
> +++ b/builtin/revert.c
> @@ -31,6 +31,17 @@ static const char * const cherry_pick_usage[] = {
> NULL
> };
>
> +static int git_revert_config(const char *k, const char *v, void *cb)
Seeing as it is used also by `cmd_cherry_pick()`, and that it is
file-local anyway, maybe `common_config()` is a better name?
This point is moot if we can call `git_default_config()` in
`git_sequencer_config()` directly, though.
> diff --git a/sequencer.c b/sequencer.c
> index 3e4c3bbb265db58df22cfcb5a321fb74d822327e..b8cf679751449591d6f97102904e060ebee9d7a1 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -688,6 +688,39 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
> return run_command(&cmd);
> }
>
> +static enum cleanup_mode default_msg_cleanup = CLEANUP_NONE;
> +static char *default_gpg_sign;
I was ready to shout about global state not meshing well with libified
code, but as long as we're sure that these values are set only while Git
executes single-threaded, still, it is the correct way to do it: these
settings reflect the config, and therefore *are* kinda global (at least
until the day when the submodule fans try to call `git commit` in a
submodule using the `struct repository` data structure).
In short: this code is good (and I was just describing a little bit of my
thinking, to demonstrate that I tried to be a diligent reviewer :-)).
Thanks,
Dscho
next prev parent reply other threads:[~2017-11-07 1:02 UTC|newest]
Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-25 10:10 [RFC PATCH 0/8] sequencer: dont't fork git commit Phillip Wood
2017-09-25 10:10 ` [RFC PATCH 1/8] commit: move empty message checks to libgit Phillip Wood
2017-09-25 10:10 ` [RFC PATCH 2/8] commit: move code to update HEAD " Phillip Wood
2017-10-07 9:54 ` Junio C Hamano
2017-10-24 10:01 ` Phillip Wood
2017-10-24 12:41 ` Junio C Hamano
2017-09-25 10:10 ` [RFC PATCH 3/8] sequencer: refactor update_head() Phillip Wood
2017-09-25 10:10 ` [RFC PATCH 4/8] commit: move post-rewrite code to libgit Phillip Wood
2017-09-25 10:10 ` [RFC PATCH 5/8] commit: move print_commit_summary() " Phillip Wood
2017-09-25 10:10 ` [RFC PATCH 6/8] sequencer: simplify adding Signed-off-by: trailer Phillip Wood
2017-09-25 10:10 ` [RFC PATCH 7/8] sequencer: load commit related config Phillip Wood
2017-09-25 10:10 ` [RFC PATCH 8/8] sequencer: try to commit without forking 'git commit' Phillip Wood
2017-11-06 11:27 ` [PATCH v1 0/8] sequencer: dont't fork git commit Phillip Wood
2017-11-06 11:27 ` [PATCH v1 1/8] commit: move empty message checks to libgit Phillip Wood
2017-11-07 0:43 ` Johannes Schindelin
2017-11-07 14:24 ` Phillip Wood
2017-11-06 11:27 ` [PATCH v1 2/8] Add a function to update HEAD after creating a commit Phillip Wood
2017-11-07 2:56 ` Junio C Hamano
2017-11-07 3:02 ` Johannes Schindelin
2017-11-07 14:26 ` Phillip Wood
2017-11-06 11:27 ` [PATCH v1 3/8] commit: move post-rewrite code to libgit Phillip Wood
2017-11-07 3:03 ` Junio C Hamano
2017-11-07 14:28 ` Phillip Wood
2017-11-06 11:27 ` [PATCH v1 4/8] commit: move print_commit_summary() " Phillip Wood
2017-11-07 3:38 ` Junio C Hamano
2017-11-07 14:32 ` Phillip Wood
2017-11-08 1:04 ` Junio C Hamano
2017-11-06 11:27 ` [PATCH v1 5/8] sequencer: don't die in print_commit_summary() Phillip Wood
2017-11-07 4:18 ` Junio C Hamano
2017-11-07 10:24 ` Johannes Schindelin
2017-11-07 15:13 ` Junio C Hamano
2017-11-10 14:53 ` Phillip Wood
2017-11-10 18:05 ` Junio C Hamano
2017-11-13 11:11 ` Phillip Wood
2017-11-06 11:27 ` [PATCH v1 6/8] sequencer: simplify adding Signed-off-by: trailer Phillip Wood
2017-11-07 0:52 ` Johannes Schindelin
2017-11-07 4:52 ` Junio C Hamano
2017-11-07 14:46 ` Phillip Wood
2017-11-06 11:27 ` [PATCH v1 7/8] sequencer: load commit related config Phillip Wood
2017-11-07 1:02 ` Johannes Schindelin [this message]
2017-11-07 10:50 ` Phillip Wood
2017-11-06 11:27 ` [PATCH v1 8/8] sequencer: try to commit without forking 'git commit' Phillip Wood
2017-11-07 1:36 ` Johannes Schindelin
2017-11-07 11:16 ` Phillip Wood
2017-11-07 14:09 ` Johannes Schindelin
2017-11-10 11:09 ` [PATCH v2 0/9] sequencer: dont't fork git commit Phillip Wood
2017-11-10 11:09 ` [PATCH v2 1/9] t3404: check intermediate squash messages Phillip Wood
2017-11-10 11:09 ` [PATCH v2 2/9] commit: move empty message checks to libgit Phillip Wood
2017-11-10 18:51 ` Ramsay Jones
2017-11-13 11:08 ` Phillip Wood
2017-11-10 11:09 ` [PATCH v2 3/9] Add a function to update HEAD after creating a commit Phillip Wood
2017-11-10 18:36 ` Junio C Hamano
2017-11-13 11:25 ` Phillip Wood
2017-11-10 11:09 ` [PATCH v2 4/9] commit: move post-rewrite code to libgit Phillip Wood
2017-11-10 11:09 ` [PATCH v2 5/9] commit: move print_commit_summary() " Phillip Wood
2017-11-10 11:09 ` [PATCH v2 6/9] sequencer: don't die in print_commit_summary() Phillip Wood
2017-11-10 11:09 ` [PATCH v2 7/9] sequencer: simplify adding Signed-off-by: trailer Phillip Wood
2017-11-10 11:09 ` [PATCH v2 8/9] sequencer: load commit related config Phillip Wood
2017-11-10 11:09 ` [PATCH v2 9/9] sequencer: try to commit without forking 'git commit' Phillip Wood
2017-11-10 19:21 ` [PATCH v2 0/9] sequencer: dont't fork git commit Junio C Hamano
2017-11-13 11:24 ` Phillip Wood
2017-11-14 1:15 ` Junio C Hamano
2017-11-17 11:34 ` [PATCH v3 0/8] sequencer: don't " Phillip Wood
2017-11-17 11:34 ` [PATCH v3 1/8] t3404: check intermediate squash messages Phillip Wood
2017-11-17 11:34 ` [PATCH v3 2/8] commit: move empty message checks to libgit Phillip Wood
2017-11-17 11:34 ` [PATCH v3 3/8] Add a function to update HEAD after creating a commit Phillip Wood
2017-11-17 11:34 ` [PATCH v3 4/8] commit: move post-rewrite code to libgit Phillip Wood
2017-11-17 11:34 ` [PATCH v3 5/8] commit: move print_commit_summary() " Phillip Wood
2017-11-17 11:34 ` [PATCH v3 6/8] sequencer: simplify adding Signed-off-by: trailer Phillip Wood
2017-11-17 11:34 ` [PATCH v3 7/8] sequencer: load commit related config Phillip Wood
2017-11-17 11:34 ` [PATCH v3 8/8] sequencer: try to commit without forking 'git commit' Phillip Wood
2017-11-18 3:41 ` [PATCH v3 0/8] sequencer: don't fork git commit Junio C Hamano
2017-11-18 3:57 ` Junio C Hamano
2017-11-18 11:32 ` Phillip Wood
2017-11-18 14:33 ` Phillip Wood
2017-11-24 11:07 ` [PATCH v4 0/9] " Phillip Wood
2017-11-24 11:07 ` [PATCH v4 1/9] t3404: check intermediate squash messages Phillip Wood
2017-11-24 11:07 ` [PATCH v4 2/9] commit: move empty message checks to libgit Phillip Wood
2017-11-24 11:07 ` [PATCH v4 3/9] Add a function to update HEAD after creating a commit Phillip Wood
2017-11-24 11:07 ` [PATCH v4 4/9] commit: move post-rewrite code to libgit Phillip Wood
2017-11-24 11:07 ` [PATCH v4 5/9] commit: move print_commit_summary() " Phillip Wood
2017-11-24 11:07 ` [PATCH v4 6/9] sequencer: simplify adding Signed-off-by: trailer Phillip Wood
2017-11-24 11:07 ` [PATCH v4 7/9] sequencer: load commit related config Phillip Wood
2017-11-24 13:48 ` Junio C Hamano
2017-11-24 14:38 ` Phillip Wood
2017-12-04 18:30 ` Junio C Hamano
2017-12-05 11:21 ` Phillip Wood
2017-12-05 12:10 ` Phillip Wood
2017-12-09 19:05 ` Phillip Wood
2017-11-24 11:07 ` [PATCH v4 8/9] sequencer: try to commit without forking 'git commit' Phillip Wood
2017-11-24 11:07 ` [PATCH v4 9/9] t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 Phillip Wood
2017-12-04 19:24 ` Stefan Beller
2017-12-05 12:13 ` Phillip Wood
2017-12-11 14:13 ` [PATCH v5 0/9] sequencer: don't fork git commit Phillip Wood
2017-12-11 14:13 ` [PATCH v5 1/9] t3404: check intermediate squash messages Phillip Wood
2017-12-11 14:13 ` [PATCH v5 2/9] commit: move empty message checks to libgit Phillip Wood
2017-12-11 14:13 ` [PATCH v5 3/9] Add a function to update HEAD after creating a commit Phillip Wood
2017-12-11 14:13 ` [PATCH v5 4/9] commit: move post-rewrite code to libgit Phillip Wood
2017-12-11 14:13 ` [PATCH v5 5/9] commit: move print_commit_summary() " Phillip Wood
2017-12-11 14:13 ` [PATCH v5 6/9] sequencer: simplify adding Signed-off-by: trailer Phillip Wood
2017-12-11 14:13 ` [PATCH v5 7/9] sequencer: load commit related config Phillip Wood
2017-12-11 18:53 ` Phillip Wood
2017-12-11 14:13 ` [PATCH v5 8/9] sequencer: try to commit without forking 'git commit' Phillip Wood
2018-01-10 20:53 ` Jonathan Nieder
2018-01-10 22:40 ` Johannes Schindelin
2018-01-11 10:41 ` Phillip Wood
2018-01-11 20:21 ` Johannes Schindelin
2017-12-11 14:13 ` [PATCH v5 9/9] t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 Phillip Wood
2017-12-11 23:44 ` [PATCH v5 0/9] sequencer: don't fork git commit Junio C Hamano
2017-12-12 10:32 ` Phillip Wood
2017-12-13 11:46 ` [PATCH] sequencer: improve config handling Phillip Wood
2017-12-20 18:33 ` Error in `git': free(): invalid pointer (was Re: [PATCH] sequencer: improve config handling) Kaartic Sivaraam
2017-12-21 14:06 ` Johannes Schindelin
2017-12-21 16:42 ` Kaartic Sivaraam
2017-12-22 11:49 ` Johannes Schindelin
2017-12-25 8:51 ` Kaartic Sivaraam
[not found] ` <18737953.1042351513802399608.JavaMail.defaultUser@defaultHost>
2017-12-21 15:02 ` Kaartic Sivaraam
2017-12-21 16:53 ` phillip.wood
2017-12-21 17:14 ` Kaartic Sivaraam
2017-12-22 10:47 ` phillip.wood
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=alpine.DEB.2.21.1.1711070202040.6482@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/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).