sha1dc: disable safe_hash feature
[gitweb.git] / git-submodule.sh
index 123ac104c6f312cc27f1ddf925c80b386bfd4f23..136e26a2c8d4ca1e835e2873f3fd994864dc135e 100755 (executable)
@@ -613,7 +613,10 @@ cmd_update()
                if test $just_cloned -eq 1
                then
                        subsha1=
-                       update_module=checkout
+                       case "$update_module" in
+                       merge | rebase | none)
+                               update_module=checkout ;;
+                       esac
                else
                        subsha1=$(sanitize_submodule_env; cd "$sm_path" &&
                                git rev-parse --verify HEAD) ||