From: Andrey Okoshkin <a.okoshkin@samsung.com>
To: Stefan Beller <sbeller@google.com>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>
Cc: "Eric Sunshine" <sunshine@sunshineco.com>,
"Martin Ågren" <martin.agren@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
vmiklos@frugalware.org
Subject: [PATCH v4] merge-recursive: check GIT_MERGE_VERBOSITY only once
Date: Mon, 30 Oct 2017 10:42:33 +0300 [thread overview]
Message-ID: <2b507ce0-0d18-d9d6-11ba-6fb0d4f4a473@samsung.com> (raw)
In-Reply-To: <CAGZ79kZ9EV=qaYyuA3kfuQ04EhLWax52MhtkmGJto2Lommc_SQ@mail.gmail.com>
Get 'GIT_MERGE_VERBOSITY' environment variable only once in
init_merge_options() and store the pointer to its value for the further check.
No intervening calls to getenv(), putenv(), setenv() or unsetenv() are done
between the initial getenv() call and the consequential result pass to strtol()
as these environment related functions could modify the string pointer returned
by the initial getenv() call.
Signed-off-by: Andrey Okoshkin <a.okoshkin@samsung.com>
Reviewed-by: Stefan Beller <sbeller@google.com>
---
Added 'reviewed-by' field.
merge-recursive.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 1494ffdb8..60084e3a0 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2163,6 +2163,7 @@ static void merge_recursive_config(struct merge_options *o)
void init_merge_options(struct merge_options *o)
{
+ const char *merge_verbosity;
memset(o, 0, sizeof(struct merge_options));
o->verbosity = 2;
o->buffer_output = 1;
@@ -2171,9 +2172,9 @@ void init_merge_options(struct merge_options *o)
o->renormalize = 0;
o->detect_rename = 1;
merge_recursive_config(o);
- if (getenv("GIT_MERGE_VERBOSITY"))
- o->verbosity =
- strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
+ merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
+ if (merge_verbosity)
+ o->verbosity = strtol(merge_verbosity, NULL, 10);
if (o->verbosity >= 5)
o->buffer_output = 0;
strbuf_init(&o->obuf, 0);
--
2.14.3
next prev parent reply other threads:[~2017-10-30 7:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20171024152727epcas2p4fb7dcf147e44aadf7733098151d469a5@epcas2p4.samsung.com>
2017-10-24 15:27 ` [PATCH] merge-recursive: check GIT_MERGE_VERBOSITY only once Andrey Okoshkin
2017-10-24 16:28 ` Stefan Beller
2017-10-24 16:45 ` Eric Sunshine
2017-10-24 17:11 ` Martin Ågren
2017-10-24 19:52 ` Jeff King
2017-10-25 1:48 ` Junio C Hamano
2017-10-25 4:07 ` Eric Sunshine
2017-10-25 7:27 ` Jeff King
2017-10-25 11:39 ` [PATCH v2] " Andrey Okoshkin
2017-10-25 11:53 ` Eric Sunshine
2017-10-25 12:27 ` Andrey Okoshkin
2017-10-25 13:03 ` [PATCH v3] " Andrey Okoshkin
2017-10-27 17:29 ` Stefan Beller
2017-10-30 7:42 ` Andrey Okoshkin [this message]
2017-10-31 1:42 ` [PATCH v4] " Junio C Hamano
2017-10-31 2:26 ` Junio C Hamano
2017-10-31 7:13 ` Andrey Okoshkin
2017-10-31 7:20 ` Junio C Hamano
2017-10-31 9:09 ` [PATCH v5] " Andrey Okoshkin
2017-10-25 11:13 ` [PATCH] " Andrey Okoshkin
2017-10-25 10:49 ` Andrey Okoshkin
2017-10-25 10:49 ` Andrey Okoshkin
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=2b507ce0-0d18-d9d6-11ba-6fb0d4f4a473@samsung.com \
--to=a.okoshkin@samsung.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--cc=sunshine@sunshineco.com \
--cc=vmiklos@frugalware.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.
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).