diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-04-14 10:18:55 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-04-14 17:29:24 +0000 |
| commit | 3efd8ebfb7bd9fed872b78525a766b38b1263f91 (patch) | |
| tree | 4eb5012f8769f04a400f4df655972326f5d6396c | |
| parent | 7e25d9285792233e9d2544a1c0603663a3e941c6 (diff) | |
| download | wireshark-3efd8ebfb7bd9fed872b78525a766b38b1263f91.tar.gz wireshark-3efd8ebfb7bd9fed872b78525a766b38b1263f91.tar.bz2 wireshark-3efd8ebfb7bd9fed872b78525a766b38b1263f91.zip | |
Use a simple "git describe".
This matches the behavior of the master branch.
Reviewed-on: https://code.wireshark.org/review/1125
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 917525764723062cbd1ba54c302f81aaff856638)
Conflicts:
make-version.pl
Change-Id: Iea987cd5ce5b5b18ca331cc77c1bce6683970934
Reviewed-on: https://code.wireshark.org/review/1126
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rwxr-xr-x | make-version.pl | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/make-version.pl b/make-version.pl index bee37b183b..ffab5cf022 100755 --- a/make-version.pl +++ b/make-version.pl @@ -2,8 +2,6 @@ # # Copyright 2004 Jörg Mayer (see AUTHORS file) # -# $Id$ -# # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs @@ -168,11 +166,11 @@ sub read_repo_info { $last_change = $line; } - # Commits in current (master-1.8) branch. We may want to use - # a different number. - chomp($line = qx{git --git-dir=$srcdir/.git describe --long --match v1.8.0-rc1}); + # Commits since last annotated tag. + chomp($line = qx{git --git-dir=$srcdir/.git describe --long --always --match "v*"}); if ($? == 0 && length($line) > 1) { my @parts = split(/-/, $line); + $git_description = $line; $num_commits = $parts[-2]; $commit_id = $parts[-1]; } @@ -189,11 +187,6 @@ sub read_repo_info { $repo_branch = basename($line); } - chomp($line = qx{git --git-dir=$srcdir/.git describe --match "v*"}); - if (defined($line)) { - $git_description = $line; - } - 1; }; |