DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc
        :subject:references:date:in-reply-to:message-id:mime-version
        :content-type; q=dns; s=sasl; b=ckPviOCvtRnweKDld5Td0MnX3bYButia
        B5eINRygMwWtzO6Ov+ULBaDkPLMeVykLMNB71Y4zSAWRd9SEaSw8X/Apx+fUGR+K
        HaSdImRljLbvf4KibW66nA/DlTtXwjqlng5oLN2vE15IRMekVPZwSS4o37QHRiLs
        P6brHqOIBkM=
From:   Junio C Hamano <gitster@pobox.com>
To:     Brandon Williams <bmwill@google.com>
Cc:     Stefan Beller <sbeller@google.com>, git@vger.kernel.org,
        jrnieder@gmail.com
Subject: Re: [PATCH] Documentation: consolidate submodule.<name>.update
References: <xmqq1smxj7md.fsf@gitster.mtv.corp.google.com>
        <20170925191011.29863-1-sbeller@google.com>
        <20170925191726.GE35385@google.com>
Date:   Tue, 26 Sep 2017 10:30:59 +0900
In-Reply-To: <20170925191726.GE35385@google.com> (Brandon Williams's message
        of "Mon, 25 Sep 2017 12:17:26 -0700")
Message-ID: <xmqqy3p2ckks.fsf@gitster.mtv.corp.google.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Sender: git-owner@vger.kernel.org
Precedence: bulk

Brandon Williams <bmwill@google.com> writes:

>> +	The method by which a submodule is updated by 'git submodule update',
>> +	which is the only affected command, others such as
>> +	'git checkout --recurse-submodules' are unaffected. It exists for
>> +	historical reasons, when 'git submodule' was the only command to
>> +	interact with submodules; settings like `submodule.active`
>> +	and `pull.rebase` are more specific. It is copied to the config
>> +	by `git submodule init` from the .gitmodules file.
>> +	Allowed values here are 'checkout', 'rebase', 'merge' or 'none'.
>> +	See description of 'update' command in linkgit:git-submodule[1]
>> +	for their meaning. Note that the '!command' form is intentionally
>> +	ignored here for security reasons.
>
> This probably needs to be tweaked a bit to say that the '!command' form
> is ignored by submodule init, in that it isn't copied over from the
> .gitmodules file, but if it is configured in your config it will be
> respected by 'submodule update'.

I do not think gitmodules.txt is the place to say anything more than
what Stefan's patch says above.  Perhaps config.txt should mention
that in addition to what the variable with the same in .gitmodules
can take, it is allowed to use the !command form.

IOW, in config.txt

	submodule.<name>.update::
		Specifies how 'git submodule update' should work on
		the named submodule.  In addition to the values that
		can be specified in (and copied from) `.gitmodules`
		(see linkgit:gitmodules[5]), `!command` form can
		also be used.

or something, perhaps?