|
|
|
@ -56,7 +56,7 @@ if [[ -z "$branch" ]]; then |
|
|
|
fi |
|
|
|
fi |
|
|
|
else |
|
|
|
else |
|
|
|
remote_name=`git config branch.${branch}.remote` |
|
|
|
remote_name=`git config branch.${branch}.remote` |
|
|
|
|
|
|
|
|
|
|
|
if [[ -n "$remote_name" ]]; then |
|
|
|
if [[ -n "$remote_name" ]]; then |
|
|
|
merge_name=`git config branch.${branch}.merge` |
|
|
|
merge_name=`git config branch.${branch}.merge` |
|
|
|
else |
|
|
|
else |
|
|
|
@ -67,7 +67,7 @@ else |
|
|
|
if [[ "$remote_name" == '.' ]]; then |
|
|
|
if [[ "$remote_name" == '.' ]]; then |
|
|
|
remote_ref="$merge_name" |
|
|
|
remote_ref="$merge_name" |
|
|
|
else |
|
|
|
else |
|
|
|
remote_ref="refs/remotes/$remote_name/${merge_name##*/}" |
|
|
|
remote_ref="refs/remotes/$remote_name/${merge_name##refs/heads/}" |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
# get the revision list, and count the leading "<" and ">" |
|
|
|
# get the revision list, and count the leading "<" and ">" |
|
|
|
|