2013-11-26 05:03:52 +08:00
|
|
|
# This is a shell library to calculate the remote repository and
|
|
|
|
# upstream branch that should be pulled by "git pull" from the current
|
|
|
|
# branch.
|
2005-08-20 17:52:24 +08:00
|
|
|
|
2005-11-24 15:46:13 +08:00
|
|
|
# git-ls-remote could be called from outside a git managed repository;
|
|
|
|
# this would fail in that case and would issue an error message.
|
2009-04-23 09:46:02 +08:00
|
|
|
GIT_DIR=$(git rev-parse -q --git-dir) || :;
|
2005-08-20 17:52:24 +08:00
|
|
|
|
2006-09-23 18:05:43 +08:00
|
|
|
get_default_remote () {
|
2011-03-30 16:48:40 +08:00
|
|
|
curr_branch=$(git symbolic-ref -q HEAD)
|
2011-03-31 10:33:33 +08:00
|
|
|
curr_branch="${curr_branch#refs/heads/}"
|
2007-07-03 13:52:14 +08:00
|
|
|
origin=$(git config --get "branch.$curr_branch.remote")
|
2006-09-23 18:05:43 +08:00
|
|
|
echo ${origin:-origin}
|
|
|
|
}
|
|
|
|
|
2009-06-12 06:39:18 +08:00
|
|
|
get_remote_merge_branch () {
|
|
|
|
case "$#" in
|
|
|
|
0|1)
|
2009-06-12 06:39:19 +08:00
|
|
|
origin="$1"
|
|
|
|
default=$(get_default_remote)
|
|
|
|
test -z "$origin" && origin=$default
|
2010-12-06 18:20:11 +08:00
|
|
|
curr_branch=$(git symbolic-ref -q HEAD) &&
|
2009-06-12 06:39:19 +08:00
|
|
|
[ "$origin" = "$default" ] &&
|
|
|
|
echo $(git for-each-ref --format='%(upstream)' $curr_branch)
|
|
|
|
;;
|
2009-06-12 06:39:18 +08:00
|
|
|
*)
|
|
|
|
repo=$1
|
|
|
|
shift
|
|
|
|
ref=$1
|
|
|
|
# FIXME: It should return the tracking branch
|
|
|
|
# Currently only works with the default mapping
|
|
|
|
case "$ref" in
|
|
|
|
+*)
|
|
|
|
ref=$(expr "z$ref" : 'z+\(.*\)')
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
expr "z$ref" : 'z.*:' >/dev/null || ref="${ref}:"
|
|
|
|
remote=$(expr "z$ref" : 'z\([^:]*\):')
|
|
|
|
case "$remote" in
|
|
|
|
'' | HEAD ) remote=HEAD ;;
|
|
|
|
heads/*) remote=${remote#heads/} ;;
|
|
|
|
refs/heads/*) remote=${remote#refs/heads/} ;;
|
|
|
|
refs/* | tags/* | remotes/* ) remote=
|
|
|
|
esac
|
2010-11-14 06:58:22 +08:00
|
|
|
[ -n "$remote" ] && case "$repo" in
|
|
|
|
.)
|
|
|
|
echo "refs/heads/$remote"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "refs/remotes/$repo/$remote"
|
|
|
|
;;
|
|
|
|
esac
|
2009-06-12 06:39:18 +08:00
|
|
|
esac
|
|
|
|
}
|
2011-02-10 09:54:02 +08:00
|
|
|
|
|
|
|
error_on_missing_default_upstream () {
|
|
|
|
cmd="$1"
|
|
|
|
op_type="$2"
|
2016-04-19 21:19:20 +08:00
|
|
|
op_prep="$3" # FIXME: op_prep is no longer used
|
2011-02-10 09:54:02 +08:00
|
|
|
example="$4"
|
|
|
|
branch_name=$(git symbolic-ref -q HEAD)
|
2016-04-19 21:19:20 +08:00
|
|
|
display_branch_name="${branch_name#refs/heads/}"
|
2012-03-04 12:41:26 +08:00
|
|
|
# If there's only one remote, use that in the suggestion
|
2016-04-19 21:19:20 +08:00
|
|
|
remote="$(gettext "<remote>")"
|
|
|
|
branch="$(gettext "<branch>")"
|
2012-03-04 12:41:26 +08:00
|
|
|
if test $(git remote | wc -l) = 1
|
|
|
|
then
|
|
|
|
remote=$(git remote)
|
|
|
|
fi
|
|
|
|
|
2011-02-10 09:54:02 +08:00
|
|
|
if test -z "$branch_name"
|
|
|
|
then
|
2016-04-19 21:19:20 +08:00
|
|
|
gettextln "You are not currently on a branch."
|
2011-02-10 09:54:02 +08:00
|
|
|
else
|
2016-04-19 21:19:20 +08:00
|
|
|
gettextln "There is no tracking information for the current branch."
|
|
|
|
fi
|
|
|
|
case "$op_type" in
|
|
|
|
rebase)
|
|
|
|
gettextln "Please specify which branch you want to rebase against."
|
|
|
|
;;
|
|
|
|
merge)
|
|
|
|
gettextln "Please specify which branch you want to merge with."
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo >&2 "BUG: unknown operation type: $op_type"
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
eval_gettextln "See git-\${cmd}(1) for details."
|
|
|
|
echo
|
|
|
|
echo " $example"
|
|
|
|
echo
|
|
|
|
if test -n "$branch_name"
|
|
|
|
then
|
|
|
|
gettextln "If you wish to set tracking information for this branch you can do so with:"
|
|
|
|
echo
|
|
|
|
echo " git branch --set-upstream-to=$remote/$branch $display_branch_name"
|
|
|
|
echo
|
2011-02-10 09:54:02 +08:00
|
|
|
fi
|
|
|
|
exit 1
|
|
|
|
}
|