From 01d4721565f1562172149ebb91d29d6a7e7f922d Mon Sep 17 00:00:00 2001 From: Stefan Zager Date: Wed, 25 Jul 2012 10:41:54 -0700 Subject: Make 'git submodule update --force' always check out submodules. Currently, it will only do a checkout if the sha1 registered in the containing repository doesn't match the HEAD of the submodule, regardless of whether the submodule is dirty. As discussed on the mailing list, the '--force' flag is a strong indicator that the state of the submodule is suspect, and should be reset to HEAD. Signed-off-by: Stefan Zager Acked-by: Jens Lehmann Signed-off-by: Junio C Hamano --- git-submodule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-submodule.sh') diff --git a/git-submodule.sh b/git-submodule.sh index fbf2fafaaf..812a60fe4c 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -537,7 +537,7 @@ Maybe you want to use 'update --init'?")" die "$(eval_gettext "Unable to find current revision in submodule path '\$sm_path'")" fi - if test "$subsha1" != "$sha1" + if test "$subsha1" != "$sha1" -o -n "$force" then subforce=$force # If we don't already have a -f flag and the submodule has never been checked out -- cgit v1.2.1