diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-08-09 20:42:27 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-08-09 20:42:27 +0200 |
| commit | 4e1fd26a5ef5adb25d53c2acbd9dbe8d18652ef5 (patch) | |
| tree | c3cffc3302835c7a9ee2ef5388579b5a8d473ee3 /lib/gitversion.pl | |
| parent | 5d13cd091a183601eb8ebedeeeed2121ce4c3781 (diff) | |
| parent | fc73dd4bdf96cbab00e7d5de67ec56503c6d9783 (diff) | |
Merge remote-tracking branch 'frr/master' into tcp-zebra
Diffstat (limited to 'lib/gitversion.pl')
| -rw-r--r-- | lib/gitversion.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitversion.pl b/lib/gitversion.pl index 8ddd9ffa55..2718046d0b 100644 --- a/lib/gitversion.pl +++ b/lib/gitversion.pl @@ -4,7 +4,7 @@ use strict; my $dir = shift; chdir $dir || die "$dir: $!\n"; -my $gitdesc = `git describe --always --dirty || echo -- \"0-gUNKNOWN\"`; +my $gitdesc = `git describe --always --first-parent --tags --dirty --match 'frr-*' || echo -- \"0-gUNKNOWN\"`; chomp $gitdesc; my $gitsuffix = ($gitdesc =~ /([0-9a-fA-F]{7}(-dirty)?)$/) ? "-g$1" : "-gUNKNOWN"; |