 a642a11fac
			
		
	
	a642a11fac
	
	
	
		
			
			Change getver.sh to append a short Git commit hash to the end of the artifical revision number. This way we still have order- and comparable commit numbers but also a direct relation to the Git commit. The new output format will look like "r2400+2-882472e" for dirty trees or like "r2402-882472e" for clean ones. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
		
			
				
	
	
		
			59 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			59 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
| #!/usr/bin/env bash
 | |
| export LANG=C
 | |
| export LC_ALL=C
 | |
| [ -n "$TOPDIR" ] && cd $TOPDIR
 | |
| 
 | |
| GET_REV=$1
 | |
| 
 | |
| try_version() {
 | |
| 	[ -f version ] || return 1
 | |
| 	REV="$(cat version)"
 | |
| 	[ -n "$REV" ]
 | |
| }
 | |
| 
 | |
| try_git() {
 | |
| 	REBOOT=ee53a240ac902dc83209008a2671e7fdcf55957a
 | |
| 	git rev-parse --git-dir >/dev/null 2>&1 || return 1
 | |
| 
 | |
| 	[ -n "$GET_REV" ] || GET_REV="HEAD"
 | |
| 
 | |
| 	case "$GET_REV" in
 | |
| 	r*)
 | |
| 		GET_REV="$(echo $GET_REV | tr -d 'r')"
 | |
| 		BASE_REV="$(git rev-list ${REBOOT}..HEAD | wc -l | awk '{print $1}')"
 | |
| 		REV="$(git rev-parse HEAD~$((BASE_REV - GET_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}')"
 | |
| 		else
 | |
| 			UPSTREAM_REV=0
 | |
| 		fi
 | |
| 
 | |
| 		if [ "$REV" -gt "$UPSTREAM_REV" ]; then
 | |
| 			REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
 | |
| 		fi
 | |
| 
 | |
| 		REV="${REV:+r$REV-$(git log --format="%h" -1)}"
 | |
| 		;;
 | |
| 	esac
 | |
| 
 | |
| 	[ -n "$REV" ]
 | |
| }
 | |
| 
 | |
| try_hg() {
 | |
| 	[ -d .hg ] || return 1
 | |
| 	REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')"
 | |
| 	REV="${REV:+r$REV}"
 | |
| 	[ -n "$REV" ]
 | |
| }
 | |
| 
 | |
| try_version || try_git || try_hg || REV="unknown"
 | |
| echo "$REV"
 |