Junio C Hamano <gits...@pobox.com> writes:
> "W. Trevor King" <wk...@tremily.us> writes:
>
>> On Sun, Jan 05, 2014 at 03:50:48AM +0100, Francesco Pretto wrote:
>>> + case "$update_module" in
>>> + '')
>>> + ;; # Unset update mode
>>> + checkout | rebase | merge | none)
>>> + ;; # Known update modes
>>> + !*)
>>> + ;; # Custom update command
>>> + *)
>>> + update_module=
>>> + echo >&2 "warning: invalid update mode for
>>> submodule '$name'"
>>> + ;;
>>> + esac
>>
>> I'd prefer `die "…"` to `echo >&2 "…"`. It's hard to know if mapping
>> the user's preferred (unknown) update mechanism to 'checkout' is
>> serious or not.
>>
>> This commit also makes me think that --rebase, --merge, and --checkout
>> should be replaced with a single --update={rebase|merge|checkout|!…}
>> option, but that's probably food for another commit (and a long
>> finger-breaking deprecation period).
>
> All of the above points sound sensible to me.
I'll tentatively queue this on 'pu' (with the suggested "die"
update), with some rewording of the log message. The patch needs to
be signed-off, though.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
