Re: [PATCH 2/3] merge-recursive: i18n submodule merge output and respect verbosity

From: Junio C Hamano <gitster@pobox.com>
Date: May 16, 2018, 01:17 UTC
Message-ID: <xmqqtvr87622.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180515200030.88731-5-sbeller@google.com>

Stefan Beller <sbeller@google.com> writes:

Show 12 quoted lines

> +static int merge_submodule(struct merge_options *o,
> +			   struct object_id *result, const char *path,
>  			   const struct object_id *base, const struct object_id *a,
> -			   const struct object_id *b, int search)
> +			   const struct object_id *b)
>  {
>  	struct commit *commit_base, *commit_a, *commit_b;
>  	int parent_count;
>  	struct object_array merges;
>  
>  	int i;
> +	int search = !o->call_depth;

I kind of like this "while at it" change in this patch ;-)