KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Reported-by: Steven Haigh <netwiz@crc.id.au>
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
This commit is contained in:
Jonas Gorski 2016-07-09 15:01:58 +02:00
parent eae812ddb6
commit f1765277ba
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/getver.sh
View file

@ -19,13 +19,13 @@ try_git() {
case "$GET_REV" in case "$GET_REV" in
r*) r*)
GET_REV="$(echo $GET_REV | tr -d '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)))" REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
;; ;;
*) *)
UPSTREAM_BASE="$(git merge-base $GET_REV origin/master)" UPSTREAM_BASE="$(git merge-base $GET_REV origin/master)"
UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE --count)" UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE | wc -l)"
REV="$(git rev-list reboot..$GET_REV --count)" REV="$(git rev-list reboot..$GET_REV | wc -l)"
if [ -n "$REV" -a -n "$UPSTREAM_REV" -a "$REV" -gt "$UPSTREAM_REV" ]; then if [ -n "$REV" -a -n "$UPSTREAM_REV" -a "$REV" -gt "$UPSTREAM_REV" ]; then
REV="r${UPSTREAM_REV}+$((REV - UPSTREAM_REV))" REV="r${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
else else