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

Since commit 55218("checkout: do not lose staged removal"), in
cmd_add/cmd_update, "git checkout <commit>" following
"git clone -n" may fail if <commit> is different from HEAD.

So Use "git checkout -f <commit>" to fix this.

Signed-off-by: Ping Yin <pkufranky@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-submodule.sh b/git-submodule.sh
index b40f876a2ca9fe985cedc622ab28a9f461edc5ab..5888735e4f2dac852f43c31195f430a1a6d23446 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -185,7 +185,7 @@ cmd_add()
        else
 
                module_clone "$path" "$realrepo" || exit
        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
 
                die "Unable to checkout submodule '$path'"
        fi
 


@@ -311,8 +311,13 @@ cmd_update()
 
                if test "$subsha1" != "$sha1"
                then
 
                if test "$subsha1" != "$sha1"
                then

+                       force=
+                       if test -z "$subsha1"
+                       then
+                               force="-f"
+                       fi

                        (unset GIT_DIR; cd "$path" && git-fetch &&
                        (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'"
                        die "Unable to checkout '$sha1' in submodule path '$path'"
 
                        say "Submodule path '$path': checked out '$sha1'"