Re: [PATCH 1/2] submodule: port subcommand 'set-branch' from shell to C
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 17, 2020, 15:06 UTC
- Message-ID
- <xmqqtv0e7g8q.fsf@gitster.c.googlers.com>
- In-Reply-To
- <4e36c8a0-4f43-79f8-137f-5fd080066af6@gmail.com>
Kaartic Sivaraam <kaartic.sivaraam@gmail.com> writes:
Show 21 quoted lines
> For those who lack the context, during the conversion of the script
> Shourya faced an issue where the '--branch' argument did not work as
> expected. He described the issue in a private e-mail where Christian
> pointed out the following (quoting his reply hoping he doesn't mind):
>
>> On Tue, May 12, 2020 at 5:55 PM Christian Couder
> <christian.couder@gmail.com> wrote:
>>>
>>> In your commit (in submodule.sh line 781) there is:
>>>
>>> `git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix
>>> "$prefix"} submodule--helper set-branch ${GIT_QUIET:+--quiet}
>>> ${branch:+--branch} ${default:+--default} -- "$@"`
>>
>> Actually the issue might come from the above. I think it should use
> ${branch:+--branch $branch} instead of ${branch:+--branch}.
>>
>> See: https://www.tldp.org/LDP/abs/html/parameter-substitution.html
>
> That's why Shourya mentions the '$branch' as extra. Of course, that's
> how it is supposed to be in the first place :)Perhaps all of that should be removed from the log message and instead go after the three-dash line then.
Thanks.