scripts/getver.sh: append short git hash based on upstream commit
The short git hash suffix printed by getver.sh is taken from the
latest local commit, change this to use the hash from latest
upstream commit if available. This is considered the intended
behavior based on commit message a642a11fac,
introducing getver.sh.
Signed-off-by: Magnus Kroken <mkroken@gmail.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
			
			
This commit is contained in:
		
				
					committed by
					
						
						Jo-Philipp Wich
					
				
			
			
				
	
			
			
			
						parent
						
							9451cd7c5b
						
					
				
				
					commit
					4bd0edc8fd
				
			@@ -40,7 +40,8 @@ try_git() {
 | 
			
		||||
			REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
 | 
			
		||||
		fi
 | 
			
		||||
 | 
			
		||||
		REV="${REV:+r$REV-$(git log --format="%h" -1)}"
 | 
			
		||||
		REV="${REV:+r$REV-$(git log -n 1 --format="%h" $UPSTREAM_BASE)}"
 | 
			
		||||
 | 
			
		||||
		;;
 | 
			
		||||
	esac
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user