- UPSTREAM_BASE="$(git merge-base $GET_REV origin/master)"
- UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE | wc -l | awk '{print $1}')"
- REV="$(git rev-list reboot..$GET_REV | wc -l | awk '{print $1}')"
- if [ -n "$REV" -a -n "$UPSTREAM_REV" -a "$REV" -gt "$UPSTREAM_REV" ]; then
- REV="r${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
+ BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+ ORIGIN="$(git rev-parse --verify --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)"
+ [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify --symbolic-full-name master@{u} 2>/dev/null)"
+ REV="$(git rev-list ${REBOOT}..$GET_REV | wc -l | awk '{print $1}')"
+
+ if [ -n "$ORIGIN" ]; then
+ UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)"
+ UPSTREAM_REV="$(git rev-list ${REBOOT}..$UPSTREAM_BASE | wc -l | awk '{print $1}')"