Merge branch 'jn/submodule-b-current'
* jn/submodule-b-current: git submodule: Remove now obsolete tests before cloning a repo git submodule -b ... of current HEAD fails
This commit is contained in:
@ -93,20 +93,6 @@ module_clone()
|
||||
url=$2
|
||||
reference="$3"
|
||||
|
||||
# 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' exists, but is neither empty nor a git repository"
|
||||
fi
|
||||
|
||||
test -e "$path" &&
|
||||
die "A file already exist at path '$path'"
|
||||
|
||||
if test -n "$reference"
|
||||
then
|
||||
git-clone "$reference" -n "$url" "$path"
|
||||
@ -241,7 +227,7 @@ cmd_add()
|
||||
# ash fails to wordsplit ${branch:+-b "$branch"...}
|
||||
case "$branch" in
|
||||
'') git checkout -f -q ;;
|
||||
?*) git checkout -f -q -b "$branch" "origin/$branch" ;;
|
||||
?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
|
||||
esac
|
||||
) || die "Unable to checkout submodule '$path'"
|
||||
fi
|
||||
|
Reference in New Issue
Block a user