Commit 33252572 authored by Nico Schottelius's avatar Nico Schottelius Committed by Linus Torvalds
Browse files

Fix scripts/setlocalversion with tagged git commit 



Produce correct output for
- tagged commit (v2.6.30-rc6)
- past tagged commit (v2.6.30-rc5-299-g7c7327d)
- no tag

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 279e677f

scripts/setlocalversion

+23 −7
Original line number Diff line number Diff line 
#!/bin/sh

# Print additional version information for non-release trees.

#

# This scripts adds local version information from the version

# control systems git, mercurial (hg) and subversion (svn).

#

# If something goes wrong, send a mail the kernel build mailinglist

# (see MAINTAINERS) and CC Nico Schottelius

# <nico-linuxsetlocalversion -at- schottelius.org>.

#

#



usage() {

	echo "Usage: $0 [srctree]" >&2
@@ -10,13 +18,21 @@ cd "${1:-.}" || usage 


# Check for git and a git repo.

if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then

	# Do we have an untagged tag?

	if atag=`git describe 2>/dev/null`; then



	# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it,

	# because this version is defined in the top level Makefile.

	if [ -z "`git describe --exact-match 2>/dev/null`" ]; then



		# If we are past a tagged commit (like "v2.6.30-rc5-302-g72357d5"),

		# we pretty print it.

		if atag="`git describe 2>/dev/null`"; then

			echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'

	# add -g${head}, if there is no usable tag



		# If we don't have a tag at all we print -g{commitish}.

		else

			printf '%s%s' -g $head

		fi

	fi



	# Is this git on svn?

	if git config --get svn-remote.svn.url >/dev/null; then