From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Jul 2025 04:44:02 GMT
Subject: Re: [PATCH] pull: add pull.autoStash config option
Message-ID: <xmqqfrev8m0d.fsf@gitster.g>
In-Reply-To: <CAPig+cTQ017qGK_Qx04+R_0rCXEOirW+oLEjeaDoCFJiQbnsGw@mail.gmail.com>

Eric Sunshine <sunshine@sunshineco.com> writes:

>>                 if (opt_autostash == -1)
>> -                       opt_autostash = config_autostash;
>> +                       opt_autostash = config_pull_autostash == -1 ? config_rebase_autostash : config_pull_autostash;
>
> You may want to wrap this over-long line. Perhaps:
>
>     opt_autostash = config_pull_autostash == -1 ?
>         config_rebase_autostash : config_pull_autostash;

Alternatively

	opt_autostash = (config_pull_autostash == -1
			 ? config_rebase_autostash
			 : config_pull_autostash);