@matheusbsbs / matheus-bagliano / commits / efa8fd7ee8

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: Francesco Pretto <ceztko@gmail.com> Signed-off-by: Signed-off-by: Junio C Hamano <gitster@pobox.com>

Francesco Pretto committed Jan 5, 2014 at 03:50 UTC efa8fd7ee8eb36df55b3549f6009f000347a796d

1 file changed +12 -1

git-submodule.sh

+12 -1

@@ -617,7 +617,7 @@ cmd_init()

617 test -z "$(git config submodule."$name".update)"

618 then

619 case "$upd" in

620 - rebase | merge | none)

620 + checkout | rebase | merge | none)

621 ;; # known modes of updating

622 *)

623 echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'"

@@ -803,6 +803,17 @@ cmd_update()

803 update_module=$update

804 else

805 update_module=$(git config submodule."$name".update)

806 + case "$update_module" in

807 + '')

808 + ;; # Unset update mode

809 + checkout | rebase | merge | none)

810 + ;; # Known update modes

811 + !*)

812 + ;; # Custom update command

813 + *)

814 + die "$(eval_gettext "Invalid update mode '$update_module' for submodule '$name'")"

815 + ;;

816 + esac

817 fi

818

819 displaypath=$(relative_path "$prefix$sm_path")