提交 efa8fd7e 编写于 作者: F Francesco Pretto 提交者: Junio C Hamano

git-submodule.sh: 'checkout' is a valid update mode

'checkout' is documented as one of the valid values for the
'submodule.<name>.update' variable, and in a repository with the
variable set to 'checkout', "git submodule update" command does
update using the 'checkout' mode.

However, it has been an accident that the implementation works this
way; any unknown value would trigger the same codepath and update
using the 'checkout' mode.

Explicitly list 'checkout' as one of the known update modes, and
error out when an unknown update mode is used.

Teach the codepath that initializes the configuration variable from
an in-tree .gitmodules that 'checkout' is one of the valid values.
The code since ac1fbbda (submodule: do not copy unknown update mode
from .gitmodules, 2013-12-02) used to treat the value 'checkout' as
unknown and mapped it to 'none', which made little sense.  With this
change, 'checkout' specified in .gitmodules will stay to be 'checkout'.
Signed-off-by: NFrancesco Pretto <ceztko@gmail.com>
Signed-off-by: NSigned-off-by: Junio C Hamano <gitster@pobox.com>
上级 b9cf14d4
......@@ -617,7 +617,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'"
......@@ -803,6 +803,17 @@ 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
*)
die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")"
;;
esac
fi
displaypath=$(relative_path "$prefix$sm_path")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册