commit 4a014580ff85428aa41b28503554b2ce982805be
author David Lamparter <equinox@opensourcerouting.org> Wed Feb 27 11:24:24 2013 +0100
committer David Lamparter <equinox@opensourcerouting.org> Tue Apr 09 17:05:08 2013 +0200
tree b66414d21e1a19ab65b34682b2027de349f5d291
parent b58c90807c9d0bfa9601704c7490a16070906004

build: fix minimal mixup in gitinfo suffix

the original version of this had issues with tagless repositories; to
fix that I removed the "-g" part from one of the regexes.  I then failed
to add those 2 characters back, leading to version numbers like
"0.99.220123456" instead of "0.99.22-ga123456".  Let's put the "-g"
back...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

lib/gitversion.pl

diff --git a/lib/gitversion.pl b/lib/gitversion.pl
index 448f13d..8ddd9ff 100644
--- a/lib/gitversion.pl
+++ b/lib/gitversion.pl
@@ -6,7 +6,7 @@
 
 my $gitdesc = `git describe --always --dirty || echo -- \"0-gUNKNOWN\"`;
 chomp $gitdesc;
-my $gitsuffix = ($gitdesc =~ /([0-9a-fA-F]{7}(-dirty)?)$/) ? $1 : "-gUNKNOWN";
+my $gitsuffix = ($gitdesc =~ /([0-9a-fA-F]{7}(-dirty)?)$/) ? "-g$1" : "-gUNKNOWN";
 
 printf STDERR "git suffix: %s\n", $gitsuffix;
 printf "#define GIT_SUFFIX \"%s\"\n", $gitsuffix;