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

git-submodule - Use "get_default_remote" from git-parse-remote

Browse Source 
Resolve_relative_url was using its own code for this function, but
this is duplication with the best result that this continues to work.
Replace with the common function provided by git-parse-remote.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mark Levedahl 2008-08-24 14:46:10 -04:00 committed by Junio C Hamano
parent d6096f17d2
commit 98fcf840af
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-submodule.sh
View File

@ -9,6 +9,7 @@ USAGE="[--quiet] [--cached] \
[--] [<path>...]|[foreach <command>]" [--] [<path>...]|[foreach <command>]"
OPTIONS_SPEC= OPTIONS_SPEC=
. git-sh-setup . git-sh-setup
. git-parse-remote
require_work_tree require_work_tree
command= command=
@ -30,9 +31,7 @@ say()
# Resolve relative url by appending to parent's url # Resolve relative url by appending to parent's url
resolve_relative_url () resolve_relative_url ()
{ {
branch="$(git symbolic-ref HEAD 2>/dev/null)" remote=$(get_default_remote)
remote="$(git config branch.${branch#refs/heads/}.remote)"
remote="${remote:-origin}"
remoteurl=$(git config "remote.$remote.url") || remoteurl=$(git config "remote.$remote.url") ||
die "remote ($remote) does not have a url defined in .git/config" die "remote ($remote) does not have a url defined in .git/config"
url="$1" url="$1"