diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-03 22:14:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-03 23:05:34 -0800 |
| commit | d77ee72662a821d66ae218056f0103eb24d8d4b4 (patch) | |
| tree | e22abdbd11735a0669362f934ae723d233c87e2b /git-parse-remote.sh | |
| parent | eb8381c88518b10d683a29deea1d43ed671f14ec (diff) | |
| parent | 8d0fc48f27304ac1bc7abf802ec53fe66fedb15a (diff) | |
| download | git-d77ee72662a821d66ae218056f0103eb24d8d4b4.tar.xz | |
Merge branch 'master' into np/dreflog
This is to resolve conflicts early in preparation for possible
inclusion of "reflog on detached HEAD" series by Nico, as having
it in 1.5.0 would really help us remove confusion between
detached and attached states.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-parse-remote.sh')
| -rwxr-xr-x | git-parse-remote.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 7e87f2e06e..3e783b7b05 100755 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -10,7 +10,7 @@ get_data_source () { echo '' ;; *) - if test "$(git-repo-config --get "remote.$1.url")" + if test "$(git-config --get "remote.$1.url")" then echo config elif test -f "$GIT_DIR/remotes/$1" @@ -32,7 +32,7 @@ get_remote_url () { echo "$1" ;; config) - git-repo-config --get "remote.$1.url" + git-config --get "remote.$1.url" ;; remotes) sed -ne '/^URL: */{ @@ -50,7 +50,7 @@ get_remote_url () { get_default_remote () { curr_branch=$(git-symbolic-ref -q HEAD | sed -e 's|^refs/heads/||') - origin=$(git-repo-config --get "branch.$curr_branch.remote") + origin=$(git-config --get "branch.$curr_branch.remote") echo ${origin:-origin} } @@ -60,7 +60,7 @@ get_remote_default_refs_for_push () { '' | branches) ;; # no default push mapping, just send matching refs. config) - git-repo-config --get-all "remote.$1.push" ;; + git-config --get-all "remote.$1.push" ;; remotes) sed -ne '/^Push: */{ s///p @@ -146,7 +146,7 @@ canon_refs_list_for_fetch () { then curr_branch=$(git-symbolic-ref -q HEAD | \ sed -e 's|^refs/heads/||') - merge_branches=$(git-repo-config \ + merge_branches=$(git-config \ --get-all "branch.${curr_branch}.merge") fi if test -z "$merge_branches" && test $is_explicit != explicit @@ -183,7 +183,7 @@ canon_refs_list_for_fetch () { done fi case "$remote" in - '') remote=HEAD ;; + '' | HEAD ) remote=HEAD ;; refs/heads/* | refs/tags/* | refs/remotes/*) ;; heads/* | tags/* | remotes/* ) remote="refs/$remote" ;; *) remote="refs/heads/$remote" ;; @@ -212,7 +212,7 @@ get_remote_default_refs_for_fetch () { echo "HEAD:" ;; config) canon_refs_list_for_fetch -d "$1" \ - $(git-repo-config --get-all "remote.$1.fetch") ;; + $(git-config --get-all "remote.$1.fetch") ;; branches) remote_branch=$(sed -ne '/#/s/.*#//p' "$GIT_DIR/branches/$1") case "$remote_branch" in '') remote_branch=master ;; esac @@ -291,7 +291,7 @@ get_uploadpack () { data_source=$(get_data_source "$1") case "$data_source" in config) - uplp=$(git-repo-config --get "remote.$1.uploadpack") + uplp=$(git-config --get "remote.$1.uploadpack") echo ${uplp:-git-upload-pack} ;; *) |