git-submodule: remember to checkout after clone

PATCH In review Lars Hjemli 1 participant 1 message Jun 15, 2016

Share & tools

Lars Hjemli

author

2016-06-15 22:43 UTC #0 lore raw

PATCH 2/5 git-submodule: remember to checkout after clone

After the initial clone of a submodule, no files would be checked out in the submodule directory if the submodule HEAD was equal to the SHA-1 specified in the index of the containing repository. This fixes the problem by simply ignoring submodule HEAD for a fresh clone.

Signed-off-by Lars Hjemli <[email protected]>

---
  git-submodule.sh |    9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)

git-submodule.sh +5 -4

index 8bdd99a..4a6d64d 100755
@@ -100,12 +100,13 @@ modules_update()
  		if ! test -d "$path"/.git
  		then
  			module_clone "$path" "$url" || exit
+			subsha1=
+		else
+			subsha1=$(unset GIT_DIR && cd "$path" &&
+				git-rev-parse --verify HEAD) ||
+			die "Unable to find current revision of submodule '$path'"
  		fi
 
-		subsha1=$(unset GIT_DIR && cd "$path" &&
-			git-rev-parse --verify HEAD) ||
-		die "Unable to find current revision of submodule '$path'"
-
  		if test "$subsha1" != "$sha1"
  		then
  			(unset GIT_DIR && cd "$path" && git-fetch &&

Signature · 1 line

1.5.2.1.914.gbd3a7