diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-08-31 23:56:25 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-09-20 11:56:19 +0000 |
| commit | ee4c70b92cfa0b44eed3d0d07078f943ce34c56a (patch) | |
| tree | b2f1acf42764ec4bc1682cc21a62d6923041bfe6 /make-version.pl | |
| parent | 72415b50661c639d0f1fb7e261241da73cd4867c (diff) | |
Add version.conf to git-export-release.
Create and stash version.conf before archiving our repository. This
makes git-export-release behave more like the current Autotools dist
target.
Make sure the `git describe` command in git-export-release and
make-version.pl use the same match pattern and abbreviation length.
Abbreviate to 8 characters. That's our current unique minimum according
to the git-unique-abbrev script at
https://blog.cuviper.com/2013/11/10/how-short-can-git-abbreviate/ :
516409 objects
4: 516194 / 65293
5: 200900 / 92205
6: 15979 / 7957
7: 1038 / 519
8: 74 / 37
9: 0 / 0
Change-Id: Id2279a59a2e24a9ecd816458f399bcd2b4c94185
Reviewed-on: https://code.wireshark.org/review/23344
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'make-version.pl')
| -rwxr-xr-x | make-version.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make-version.pl b/make-version.pl index 17b64b26de..42c5db6d7a 100755 --- a/make-version.pl +++ b/make-version.pl @@ -207,7 +207,7 @@ sub read_repo_info { } # Commits since last annotated tag. - chomp($line = qx{$git_executable --git-dir="$srcdir"/.git describe --long --always --match "v*"}); + chomp($line = qx{$git_executable --git-dir="$srcdir"/.git describe --abbrev=8 --long --always --match "v[1-9]*"}); if ($? == 0 && length($line) > 1) { my @parts = split(/-/, $line); $git_description = $line; |