mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint

Browse Source 
* jl/submodule-add-relurl-wo-upstream:
  submodule add: clean up duplicated code
  submodule add: allow relative repository path even when no url is set
  submodule add: test failure when url is not configured in superproject

Conflicts:
	git-submodule.sh
This commit is contained in:
Junio C Hamano
2011-08-16 12:41:13 -07:00
parent 2a76497427 f22a17e8da
commit f4af7f1963
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
git-submodule.sh
View File

@ -34,7 +34,7 @@ resolve_relative_url ()
{
remote=$(get_default_remote)
remoteurl=$(git config "remote.$remote.url") ||
die "remote ($remote) does not have a url defined in .git/config"
remoteurl=$(pwd) # the repository is its own authoritative upstream
url="$1"
remoteurl=${remoteurl%/}
sep=/
@ -238,14 +238,6 @@ cmd_add()
die "'$path' already exists and is not a valid git repo"
fi
case "$repo" in
./*|../*)
url=$(resolve_relative_url "$repo") || exit
;;
*)
url="$repo"
;;
esac
else
module_clone "$path" "$realrepo" "$reference" || exit
@ -259,7 +251,7 @@ cmd_add()
esac
) || die "Unable to checkout submodule '$path'"
fi
git config submodule."$path".url "$url"
git config submodule."$path".url "$realrepo"
git add $force "$path" ||
die "Failed to add submodule '$path'"