From 804862209bcbc29f2e7850ecf29f17c1c1aaae6e Mon Sep 17 00:00:00 2001 From: Andrey Okoshkin Date: Tue, 31 Oct 2017 12:09:13 +0300 Subject: merge-recursive: check GIT_MERGE_VERBOSITY only once Get rid of the duplicated getenv('GIT_MERGE_VERBOSITY') calls with the same constant string argument. This makes code more readable and prevents typo in the further development. Signed-off-by: Andrey Okoshkin Reviewed-by: Stefan Beller Signed-off-by: Junio C Hamano --- merge-recursive.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'merge-recursive.c') diff --git a/merge-recursive.c b/merge-recursive.c index 7a7d55aab..6b3109e3a 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2162,6 +2162,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; @@ -2170,9 +2171,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); -- cgit v1.2.1