[PATCH 2/3] git-submodule: use get_remote in resolve_relative_url
- From
David Aguilar <davvid@gmail.com>
- Date
- Aug 24, 2008, 17:21 UTC
- Message-ID
- <341166c1e31ba26c4e8e48cd7cf9ce12a9f745b9.1219598198.git.davvid@gmail.com>
- In-Reply-To
- <e21617f50ffaae98ab73fa364e40440397bcbe33.1219598198.git.davvid@gmail.com>
This change removes replaces the remote finding logic in resolve_relative_url with the new get_remote function.
Signed-off-by: David Aguilar <davvid@gmail.com> --- git-submodule.sh | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 9d2bddb..d2ae835 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -39,9 +39,7 @@ get_remote() # Resolve relative url by appending to parent's url resolve_relative_url () { - branch="$(git symbolic-ref HEAD 2>/dev/null)" - remote="$(git config branch.${branch#refs/heads/}.remote)" - remote="${remote:-origin}" + remote=$(get_remote) remoteurl=$(git config "remote.$remote.url") || die "remote ($remote) does not have a url defined in .git/config" url="$1"
-- 1.6.0.90.g436ed