|
|
|
@ -111,6 +111,15 @@ else |
|
|
|
remote_ref="refs/remotes/$remote_name/${merge_name##refs/heads/}" |
|
|
|
remote_ref="refs/remotes/$remote_name/${merge_name##refs/heads/}" |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# detect if the local branch have a remote tracking branch |
|
|
|
|
|
|
|
cmd_output=$(git rev-parse --abbrev-ref ${branch}@{upstream} 2>&1 >/dev/null) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ `count_lines "$cmd_output" "fatal: No upstream"` == 1 ] ; then |
|
|
|
|
|
|
|
has_remote_tracking=0 |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
has_remote_tracking=1 |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
# get the revision list, and count the leading "<" and ">" |
|
|
|
# get the revision list, and count the leading "<" and ">" |
|
|
|
revgit=`git rev-list --left-right ${remote_ref}...HEAD` |
|
|
|
revgit=`git rev-list --left-right ${remote_ref}...HEAD` |
|
|
|
num_revs=`all_lines "$revgit"` |
|
|
|
num_revs=`all_lines "$revgit"` |
|
|
|
@ -123,10 +132,15 @@ else |
|
|
|
remote="${remote}${symbols_ahead}${num_ahead}" |
|
|
|
remote="${remote}${symbols_ahead}${num_ahead}" |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
if [[ -z "$remote" ]] ; then |
|
|
|
if [[ -z "$remote" ]] ; then |
|
|
|
remote='.' |
|
|
|
remote='.' |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [[ "$has_remote_tracking" == "0" ]] ; then |
|
|
|
|
|
|
|
remote='L' |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
for w in "$branch" "$remote" $num_staged $num_conflicts $num_changed $num_untracked $num_stashed $clean ; do |
|
|
|
for w in "$branch" "$remote" $num_staged $num_conflicts $num_changed $num_untracked $num_stashed $clean ; do |
|
|
|
echo "$w" |
|
|
|
echo "$w" |
|
|
|
done |
|
|
|
done |
|
|
|
|