diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-06-18 10:24:39 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-06-18 10:24:39 +0300 |
| commit | ceb84269c65974da7353c35c3abc96ea7830c85a (patch) | |
| tree | 1989cd2e91537ed1f501ef36a8fd1fea5a5430d0 | |
| parent | 8c2393db9a9228456f63243193fa1c08b0561cf6 (diff) | |
| parent | 68d4fe5195c4a5ee732bb6069b82adca8588640e (diff) | |
Merge branch 'po-git-describe-version' into 'master'
Only use version tags for version string
See merge request gitlab-org/gitaly!2295
| -rw-r--r-- | _support/makegen.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_support/makegen.go b/_support/makegen.go index 47957375d..2b5250ab6 100644 --- a/_support/makegen.go +++ b/_support/makegen.go @@ -171,7 +171,7 @@ func (gm *gitalyMake) VersionFromFile() string { } func (gm *gitalyMake) VersionFromGit() string { - cmd := exec.Command("git", "describe") + cmd := exec.Command("git", "describe", "--match", "v*") cmd.Stderr = os.Stderr out, err := cmd.Output() if err != nil { |