undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-submodule: move cloning into a separate function

Browse Source 
This is just a simple refactoring of modules_init() with no change in
functionality.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lars Hjemli 2007-06-06 11:13:01 +02:00 committed by Junio C Hamano
parent 6abd0fb396
commit 33aa6fff5d
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
git-submodule.sh
View File

@ -25,6 +25,33 @@ say()
fi fi
} }
#
# Clone a submodule
#
module_clone()
{
path=$1
url=$2
# If there already is a directory at the submodule path,
# expect it to be empty (since that is the default checkout
# action) and try to remove it.
# Note: if $path is a symlink to a directory the test will
# succeed but the rmdir will fail. We might want to fix this.
if test -d "$path"
then
rmdir "$path" 2>/dev/null ||
die "Directory '$path' exist, but is neither empty nor a git repository"
fi
test -e "$path" &&
die "A file already exist at path '$path'"
git-clone -n "$url" "$path" ||
die "Clone of submodule '$path' failed"
}
# #
# Run clone + checkout on missing submodules # Run clone + checkout on missing submodules
# #
@ -40,20 +67,6 @@ modules_init()
# repository # repository
test -d "$path"/.git && continue test -d "$path"/.git && continue
# If there already is a directory at the submodule path,
# expect it to be empty (since that is the default checkout
# action) and try to remove it.
# Note: if $path is a symlink to a directory the test will
# succeed but the rmdir will fail. We might want to fix this.
if test -d "$path"
then
rmdir "$path" 2>/dev/null ||
die "Directory '$path' exist, but is neither empty nor a git repository"
fi
test -e "$path" &&
die "A file already exist at path '$path'"
url=$(GIT_CONFIG=.gitmodules git-config module."$path".url) url=$(GIT_CONFIG=.gitmodules git-config module."$path".url)
test -z "$url" && test -z "$url" &&
die "No url found for submodule '$path' in .gitmodules" die "No url found for submodule '$path' in .gitmodules"
@ -69,8 +82,7 @@ modules_init()
# logical modulename (if present) as key. But this would need # logical modulename (if present) as key. But this would need
# another fallback mechanism if the module wasn't named. # another fallback mechanism if the module wasn't named.
git-clone -n "$url" "$path" || module_clone "$path" "$url" || exit
die "Clone of submodule '$path' failed"
(unset GIT_DIR && cd "$path" && git-checkout -q "$sha1") || (unset GIT_DIR && cd "$path" && git-checkout -q "$sha1") ||
die "Checkout of submodule '$path' failed" die "Checkout of submodule '$path' failed"