On Sun, Jan 05, 2014 at 03:50:48AM +0100, Francesco Pretto wrote:
> According to "Documentation/gitmodules.txt", 'checkout' is a valid
> 'submodule.<name>.update' command. Also "git-submodule.sh" refers to
> it and processes it correctly. Reflect commit 'ac1fbb' to support this
> syntax and also validates property values during 'update' command,
> issuing a warning if the value found is unknwon.
s/unknwon/unknown/
> ---
> git-submodule.sh | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/git-submodule.sh b/git-submodule.sh
> index 2677f2e..1d041a7 100755
> --- a/git-submodule.sh
> +++ b/git-submodule.sh
> @@ -622,7 +622,7 @@ cmd_init()
> test -z "$(git config submodule."$name".update)"
> then
> case "$upd" in
> - rebase | merge | none)
> + checkout | rebase | merge | none)
> ;; # known modes of updating
> *)
> echo >&2 "warning: unknown update mode '$upd'
> suggested for submodule '$name'"
> @@ -805,6 +805,18 @@ cmd_update()
> update_module=$update
> else
> update_module=$(git config submodule."$name".update)
> + 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'"
How about additionally telling the user the current value that is wrong
like this:
echo >&2 "warning: invalid update mode '$update_module' for submodule
'$name'"
?
But apart from those minor nits the patch looks good to me.
Cheers Heiko
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
