From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 12/14] trailer: factor out config reading
Date: Tue, 29 Dec 2015 02:35:37 -0500 [thread overview]
Message-ID: <20151229073536.GL8842@sigill.intra.peff.net> (raw)
In-Reply-To: <20151229071847.GA8726@sigill.intra.peff.net>
The only entry point into the trailer.c code is
process_trailers, which initializes itself by reading the
trailer config. Let's pull that out into a separate function
and protect it with a lazy-initialization flag. That will
let us easily add new entry points in future patches.
Signed-off-by: Jeff King <peff@peff.net>
---
trailer.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/trailer.c b/trailer.c
index 6f3416f..18bf209 100644
--- a/trailer.c
+++ b/trailer.c
@@ -842,6 +842,19 @@ static void free_all(struct trailer_item **first)
}
}
+static void init_trailer_config(void)
+{
+ static int initialized;
+
+ if (initialized)
+ return;
+
+ git_config(git_trailer_default_config, NULL);
+ git_config(git_trailer_config, NULL);
+
+ initialized = 1;
+}
+
void process_trailers(const char *file, int trim_empty, struct string_list *trailers)
{
struct trailer_item *in_tok_first = NULL;
@@ -850,10 +863,7 @@ void process_trailers(const char *file, int trim_empty, struct string_list *trai
struct strbuf **lines;
int trailer_end;
- /* Default config must be setup first */
- git_config(git_trailer_default_config, NULL);
- git_config(git_trailer_config, NULL);
-
+ init_trailer_config();
lines = read_input_file(file);
/* Print the lines before the trailers */
--
2.7.0.rc3.367.g09631da
next prev parent reply other threads:[~2015-12-29 7:35 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-29 7:18 [PATCH 0/14] counting trailers with shortlogs Jeff King
2015-12-29 7:19 ` [PATCH 01/14] move string functions out of git-compat-util Jeff King
2015-12-29 7:20 ` [PATCH 02/14] log: refactor add_header to drop some magic numbers Jeff King
2015-12-31 6:21 ` Eric Sunshine
2016-01-01 8:42 ` Jeff King
2016-01-01 8:46 ` Jeff King
2015-12-29 7:22 ` [PATCH 03/14] strutil: add skip_prefix_icase Jeff King
2015-12-31 6:40 ` Eric Sunshine
2016-01-01 8:50 ` Jeff King
2015-12-29 7:27 ` [PATCH 04/14] shortlog: use skip_prefix_icase to parse "Author" lines Jeff King
2015-12-31 6:47 ` Eric Sunshine
2016-01-01 8:53 ` Jeff King
2015-12-29 7:28 ` [PATCH 05/14] shortlog: use strbufs to read from stdin Jeff King
2015-12-29 7:29 ` [PATCH 06/14] shortlog: replace hand-parsing of author with pretty-printer Jeff King
2016-01-04 9:43 ` Eric Sunshine
2016-01-04 10:17 ` Jeff King
2015-12-29 7:30 ` [PATCH 07/14] shortlog: optimize "--summary" mode Jeff King
2015-12-29 7:31 ` [PATCH 08/14] shortlog: optimize out useless "<none>" normalization Jeff King
2015-12-29 7:32 ` [PATCH 09/14] shortlog: optimize out useless string list Jeff King
2015-12-29 7:32 ` [PATCH 10/14] shortlog: change "author" variables to "ident" Jeff King
2015-12-29 7:35 ` [PATCH 11/14] shortlog: allow grouping by committer ident Jeff King
2016-01-04 9:44 ` Eric Sunshine
2016-01-04 10:23 ` Jeff King
2015-12-29 7:35 ` Jeff King [this message]
2015-12-29 7:36 ` [PATCH 13/14] trailer: add interface for parsing commit trailers Jeff King
2015-12-29 7:38 ` [PATCH 14/14] shortlog: match commit trailers with --ident Jeff King
2015-12-29 7:50 ` Jeff King
2016-01-04 9:44 ` Eric Sunshine
2016-01-04 10:31 ` Jeff King
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=20151229073536.GL8842@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/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 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 NNTP newsgroup(s).