undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ao/merge-verbosity-getenv-just-once'

Browse Source 
Code cleanup.

* ao/merge-verbosity-getenv-just-once:
  merge-recursive: check GIT_MERGE_VERBOSITY only once
This commit is contained in:
Junio C Hamano 2017-11-15 12:14:28 +09:00
commit a6ee796aa8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
merge-recursive.c
View File

@ -2201,6 +2201,7 @@ static void merge_recursive_config(struct merge_options *o)
void init_merge_options(struct merge_options *o) void init_merge_options(struct merge_options *o)
{ {
const char *merge_verbosity;
memset(o, 0, sizeof(struct merge_options)); memset(o, 0, sizeof(struct merge_options));
o->verbosity = 2; o->verbosity = 2;
o->buffer_output = 1; o->buffer_output = 1;
@ -2209,9 +2210,9 @@ void init_merge_options(struct merge_options *o)
o->renormalize = 0; o->renormalize = 0;
o->detect_rename = 1; o->detect_rename = 1;
merge_recursive_config(o); merge_recursive_config(o);
if (getenv("GIT_MERGE_VERBOSITY")) merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
o->verbosity = if (merge_verbosity)
strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10); o->verbosity = strtol(merge_verbosity, NULL, 10);
if (o->verbosity >= 5) if (o->verbosity >= 5)
o->buffer_output = 0; o->buffer_output = 0;
strbuf_init(&o->obuf, 0); strbuf_init(&o->obuf, 0);