From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 06 Jan 2014 16:20:53 GMT
Subject: Re: [PATCH 1/2] git-submodule.sh: Support 'checkout' as a valid update command
Message-ID: <xmqq7gadkroa.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20140105204423.GF3156@odin.tremily.us>

"W. Trevor King" <wking@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.