diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-17 12:21:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-17 12:21:20 -0800 |
| commit | 1aeb10a14d5ecf5a10a4536b873c9feb244a7848 (patch) | |
| tree | 5e5953867a1f038da8bd525c55b1f2d888e0841f | |
| parent | Merge branch 'nd/shallow-clone' (diff) | |
| parent | git-submodule.sh: 'checkout' is a valid update mode (diff) | |
| download | tgif-1aeb10a14d5ecf5a10a4536b873c9feb244a7848.tar.xz | |
Merge branch 'fp/submodule-checkout-mode'
"submodule.*.update=checkout", when propagated from .gitmodules to
.git/config, turned into a "submodule.*.update=none", which did not
make much sense.
* fp/submodule-checkout-mode:
git-submodule.sh: 'checkout' is a valid update mode
| -rwxr-xr-x | git-submodule.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 2677f2e8b3..4a30087768 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,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") |