git-submodule: Fix "Unable to checkout" for the initial 'update'

pkufranky · spearce · commit b9b378a001d3 · 2008-09-29T08:24:19.000-07:00
Since commit 55218("checkout: do not lose staged removal"), in
cmd_add/cmd_update, "git checkout &lt;commit&gt;" following
"git clone -n" may fail if &lt;commit&gt; is different from HEAD.

So Use "git checkout -f &lt;commit&gt;" to fix this.

Signed-off-by: Ping Yin &lt;pkufranky@gmail.com&gt;
Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
diff --git a/git-submodule.sh b/git-submodule.sh
@@ -185,7 +185,7 @@ cmd_add()
 	else
 
 		module_clone "$path" "$realrepo" || exit
-		(unset GIT_DIR; cd "$path" && git checkout -q ${branch:+-b "$branch" "origin/$branch"}) ||
+		(unset GIT_DIR; cd "$path" && git checkout -f -q ${branch:+-b "$branch" "origin/$branch"}) ||
 		die "Unable to checkout submodule '$path'"
 	fi
 
@@ -311,8 +311,13 @@ cmd_update()
 
 		if test "$subsha1" != "$sha1"
 		then
+			force=
+			if test -z "$subsha1"
+			then
+				force="-f"
+			fi
 			(unset GIT_DIR; cd "$path" && git-fetch &&
-				git-checkout -q "$sha1") ||
+				git-checkout $force -q "$sha1") ||
 			die "Unable to checkout '$sha1' in submodule path '$path'"
 
 			say "Submodule path '$path': checked out '$sha1'"
