# git-ls-remote could be called from outside a git managed repository;
# this would fail in that case and would issue an error message.
-GIT_DIR=$(git-rev-parse --git-dir 2>/dev/null) || :;
+GIT_DIR=$(git rev-parse --git-dir 2>/dev/null) || :;
get_data_source () {
case "$1" in
*/*)
- # Not so fast. This could be the partial URL shorthand...
- token=$(expr "z$1" : 'z\([^/]*\)/')
- remainder=$(expr "z$1" : 'z[^/]*/\(.*\)')
- if test "$(git-repo-config --get "remote.$token.url")"
- then
- echo config-partial
- elif test -f "$GIT_DIR/branches/$token"
- then
- echo branches-partial
- else
- echo ''
- fi
+ echo ''
+ ;;
+ .)
+ echo self
;;
*)
- 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"
data_source=$(get_data_source "$1")
case "$data_source" in
'')
- echo "$1" ;;
- config-partial)
- token=$(expr "z$1" : 'z\([^/]*\)/')
- remainder=$(expr "z$1" : 'z[^/]*/\(.*\)')
- url=$(git-repo-config --get "remote.$token.url")
- echo "$url/$remainder"
+ echo "$1"
+ ;;
+ self)
+ echo "$1"
;;
config)
- git-repo-config --get "remote.$1.url"
+ git config --get "remote.$1.url"
;;
remotes)
sed -ne '/^URL: */{
s///p
q
- }' "$GIT_DIR/remotes/$1" ;;
+ }' "$GIT_DIR/remotes/$1"
+ ;;
branches)
- sed -e 's/#.*//' "$GIT_DIR/branches/$1" ;;
- branches-partial)
- token=$(expr "z$1" : 'z\([^/]*\)/')
- remainder=$(expr "z$1" : 'z[^/]*/\(.*\)')
- url=$(sed -e 's/#.*//' "$GIT_DIR/branches/$token")
- echo "$url/$remainder"
+ sed -e 's/#.*//' "$GIT_DIR/branches/$1"
;;
*)
die "internal error: get-remote-url $1" ;;
}
get_default_remote () {
- curr_branch=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')
- origin=$(git-repo-config --get "branch.$curr_branch.remote")
+ curr_branch=$(git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||')
+ origin=$(git config --get "branch.$curr_branch.remote")
echo ${origin:-origin}
}
get_remote_default_refs_for_push () {
data_source=$(get_data_source "$1")
case "$data_source" in
- '' | config-partial | branches | branches-partial)
+ '' | branches | self)
;; # 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
# from get_remote_refs_for_fetch when it deals with refspecs
# supplied on the command line. $ls_remote_result has the list
# of refs available at remote.
+#
+# The first token returned is either "explicit" or "glob"; this
+# is to help prevent randomly "globbed" ref from being chosen as
+# a merge candidate
expand_refs_wildcard () {
- for ref
- do
- # a non glob pattern is given back as-is.
- expr "z$ref" : 'zrefs/.*/\*:refs/.*/\*$' >/dev/null || {
- echo "$ref"
- continue
- }
- from=`expr "z$ref" : 'z\(refs/.*/\)\*:refs/.*/\*$'`
- to=`expr "z$ref" : 'zrefs/.*/\*:\(refs/.*/\)\*$'`
- echo "$ls_remote_result" |
- (
- IFS=' '
- while read sha1 name
- do
- mapped=${name#"$from"}
- if test "z$name" != "z${name#'^{}'}" ||
- test "z$name" = "z$mapped"
- then
- continue
- fi
- echo "${name}:${to}${mapped}"
- done
- )
- done
+ echo "$ls_remote_result" |
+ git fetch--tool expand-refs-wildcard "-" "$@"
}
# Subroutine to canonicalize remote:local notation.
# or the first one otherwise; add prefix . to the rest
# to prevent the secondary branches to be merged by default.
merge_branches=
+ curr_branch=
if test "$1" = "-d"
then
shift ; remote="$1" ; shift
+ set $(expand_refs_wildcard "$remote" "$@")
+ is_explicit="$1"
+ shift
if test "$remote" = "$(get_default_remote)"
then
- curr_branch=$(git-symbolic-ref HEAD | \
+ 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
- set x $(expand_refs_wildcard "$@")
- shift
+ if test -z "$merge_branches" && test $is_explicit != explicit
+ then
+ merge_branches=..this.will.never.match.any.ref..
+ fi
fi
for ref
do
done
fi
case "$remote" in
- '') remote=HEAD ;;
- refs/heads/* | refs/tags/* | refs/remotes/*) ;;
+ '' | HEAD ) remote=HEAD ;;
+ refs/*) ;;
heads/* | tags/* | remotes/* ) remote="refs/$remote" ;;
*) remote="refs/heads/$remote" ;;
esac
case "$local" in
'') local= ;;
- refs/heads/* | refs/tags/* | refs/remotes/*) ;;
+ refs/*) ;;
heads/* | tags/* | remotes/* ) local="refs/$local" ;;
*) local="refs/heads/$local" ;;
esac
if local_ref_name=$(expr "z$local" : 'zrefs/\(.*\)')
then
- git-check-ref-format "$local_ref_name" ||
+ git check-ref-format "$local_ref_name" ||
die "* refusing to create funny ref '$local_ref_name' locally"
fi
echo "${dot_prefix}${force}${remote}:${local}"
get_remote_default_refs_for_fetch () {
data_source=$(get_data_source "$1")
case "$data_source" in
- '' | config-partial | branches-partial)
+ '')
echo "HEAD:" ;;
+ self)
+ canon_refs_list_for_fetch -d "$1" \
+ $(git for-each-ref --format='%(refname):')
+ ;;
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
}' "$GIT_DIR/remotes/$1")
;;
*)
- die "internal error: get-remote-default-ref-for-push $1" ;;
+ die "internal error: get-remote-default-ref-for-fetch $1" ;;
esac
}
esac
done
}
+
+get_uploadpack () {
+ data_source=$(get_data_source "$1")
+ case "$data_source" in
+ config)
+ uplp=$(git config --get "remote.$1.uploadpack")
+ echo ${uplp:-git-upload-pack}
+ ;;
+ *)
+ echo "git-upload-pack"
+ ;;
+ esac
+}