adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix scripts/setlocalversion with tagged git commit

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

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Nico Schottelius 2009-05-16 14:00:56 +02:00 committed by Linus Torvalds
parent 279e677faa
commit 33252572e7
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/setlocalversion
View file

@ -1,5 +1,13 @@
#!/bin/sh #!/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() { usage() {
echo "Usage: $0 [srctree]" >&2 echo "Usage: $0 [srctree]" >&2
@ -10,12 +18,20 @@ cd "${1:-.}" || usage
# Check for git and a git repo. # Check for git and a git repo.
if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then 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,
echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' # because this version is defined in the top level Makefile.
# add -g${head}, if there is no usable tag if [ -z "`git describe --exact-match 2>/dev/null`" ]; then
else
printf '%s%s' -g $head # 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))}'
# If we don't have a tag at all we print -g{commitish}.
else
printf '%s%s' -g $head
fi
fi fi
# Is this git on svn? # Is this git on svn?