Skip to content
Snippets Groups Projects
Commit f1765277 authored by Jonas Gorski's avatar Jonas Gorski
Browse files

scripts/getver.sh: avoid use of git rev-list --count


This is not a valid option in older git version, used in e.g. RHEL6.

Reported-by: default avatarSteven Haigh <netwiz@crc.id.au>
Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
parent eae812dd
No related branches found
No related tags found
No related merge requests found
......@@ -19,13 +19,13 @@ try_git() {
case "$GET_REV" in
r*)
GET_REV="$(echo $GET_REV | tr -d 'r')"
BASE_REV="$(git rev-list reboot..HEAD --count)"
BASE_REV="$(git rev-list reboot..HEAD | wc -l)"
REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
;;
*)
UPSTREAM_BASE="$(git merge-base $GET_REV origin/master)"
UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE --count)"
REV="$(git rev-list reboot..$GET_REV --count)"
UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE | wc -l)"
REV="$(git rev-list reboot..$GET_REV | wc -l)"
if [ -n "$REV" -a -n "$UPSTREAM_REV" -a "$REV" -gt "$UPSTREAM_REV" ]; then
REV="r${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment