mirror of
https://github.com/git/git.git
synced 2024-11-18 06:54:55 +01:00
78c6e0f3fa
* mz/rebase: (34 commits)
rebase: define options in OPTIONS_SPEC
Makefile: do not install sourced rebase scripts
rebase: use @{upstream} if no upstream specified
rebase -i: remove unnecessary state rebase-root
rebase -i: don't read unused variable preserve_merges
git-rebase--am: remove unnecessary --3way option
rebase -m: don't print exit code 2 when merge fails
rebase -m: remember allow_rerere_autoupdate option
rebase: remember strategy and strategy options
rebase: remember verbose option
rebase: extract code for writing basic state
rebase: factor out sub command handling
rebase: make -v a tiny bit more verbose
rebase -i: align variable names
rebase: show consistent conflict resolution hint
rebase: extract am code to new source file
rebase: extract merge code to new source file
rebase: remove $branch as synonym for $orig_head
rebase -i: support --stat
rebase: factor out call to pre-rebase hook
...
90 lines
2.5 KiB
Bash
90 lines
2.5 KiB
Bash
#!/bin/sh
|
|
|
|
# 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 -q --git-dir) || :;
|
|
|
|
get_default_remote () {
|
|
curr_branch=$(git symbolic-ref -q HEAD)
|
|
curr_branch="${curr_branch#refs/heads/}"
|
|
origin=$(git config --get "branch.$curr_branch.remote")
|
|
echo ${origin:-origin}
|
|
}
|
|
|
|
get_remote_merge_branch () {
|
|
case "$#" in
|
|
0|1)
|
|
origin="$1"
|
|
default=$(get_default_remote)
|
|
test -z "$origin" && origin=$default
|
|
curr_branch=$(git symbolic-ref -q HEAD) &&
|
|
[ "$origin" = "$default" ] &&
|
|
echo $(git for-each-ref --format='%(upstream)' $curr_branch)
|
|
;;
|
|
*)
|
|
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
|
|
[ -n "$remote" ] && case "$repo" in
|
|
.)
|
|
echo "refs/heads/$remote"
|
|
;;
|
|
*)
|
|
echo "refs/remotes/$repo/$remote"
|
|
;;
|
|
esac
|
|
esac
|
|
}
|
|
|
|
error_on_missing_default_upstream () {
|
|
cmd="$1"
|
|
op_type="$2"
|
|
op_prep="$3"
|
|
example="$4"
|
|
branch_name=$(git symbolic-ref -q HEAD)
|
|
if test -z "$branch_name"
|
|
then
|
|
echo "You are not currently on a branch, so I cannot use any
|
|
'branch.<branchname>.merge' in your configuration file.
|
|
Please specify which branch you want to $op_type $op_prep on the command
|
|
line and try again (e.g. '$example').
|
|
See git-${cmd}(1) for details."
|
|
else
|
|
echo "You asked me to $cmd without telling me which branch you
|
|
want to $op_type $op_prep, and 'branch.${branch_name#refs/heads/}.merge' in
|
|
your configuration file does not tell me, either. Please
|
|
specify which branch you want to use on the command line and
|
|
try again (e.g. '$example').
|
|
See git-${cmd}(1) for details.
|
|
|
|
If you often $op_type $op_prep the same branch, you may want to
|
|
use something like the following in your configuration file:
|
|
[branch \"${branch_name#refs/heads/}\"]
|
|
remote = <nickname>
|
|
merge = <remote-ref>"
|
|
test rebase = "$op_type" &&
|
|
echo " rebase = true"
|
|
echo "
|
|
[remote \"<nickname>\"]
|
|
url = <url>
|
|
fetch = <refspec>
|
|
|
|
See git-config(1) for details."
|
|
fi
|
|
exit 1
|
|
}
|