Home page logo
/

wireshark logo Wireshark mailing list archives

Re: Git tags
From: Gerald Combs <gerald () wireshark org>
Date: Wed, 29 Jan 2014 11:28:01 -0800

On 1/29/14 9:04 AM, Bálint Réczey wrote:
Hi Gerald,

2014-01-24 Gerald Combs <gerald () wireshark org>:
After Tuesday's migration I plan on adding the following tags. This
should make it easier to use 'git describe' to generate version numbers
and provide a consistent tag history in our current branches.
Most of those git commits are already tagged with wireshark-1.xx.x.
Will those tags be preserved in gerrit repository (I hope so :-))?

I don't have any plans to delete them. :) The wireshark-1.xx.x tags are
all lightweight due to the svn-all-fast-export rule set that we were
using. The proposed tags below would be annotated and signed.

From what Google tells me multiple tags can point to a single commit.
For example, 429f3cdf has the lightweight tag "wireshark-1.10.5". If I
add an annotated tag with

$ git tag --annotate --sign \
    --message="Build 1.10.5. (SVN r54262)" \
    v1.10.5 429f3cdf28dc053f163a5b8edca2e084f5c7e211

in a test repository here git log shows both tags:

$ git log -1 --tags --pretty="%H %d" --decorate=full 429f3cdf
429f3cdf28dc053f163a5b8edca2e084f5c7e211  (tag:
refs/tags/wireshark-1.10.5, tag: refs/tags/v1.10.5)

You can use "git describe --match" to select each prefix

$ git describe
v1.10.5-27-g69c7403

$ git describe --tags  --match "wireshark-*"
wireshark-1.10.5-27-g69c7403

I picked the "v" prefix because it seems to be common practice in the
Git world and in our case it makes it easy to distinguish between a
post-migration annotated tag vs a pre-migration lightweight tag. If
sticking with "wireshark-" would make more sense (e.g. for downstream
packaging) we can do that.

In the mean time I'll at least push a v1.11.3-rc1 tag for 16e27047 so
that we can get useful versions in master.


When creating new tags could you please sign them as well?

That's the plan.

Git commit      SVN rev Tag             SVN commit message

master:

ea19c7f9        48972   v1.11.0-rc1     1.9.3 → 1.11.0.
b4f3f2ff        52628   v1.11.0         Try building 1.11.0.
6fcea10d        52629   v1.11.1-rc1     1.11.0 → 1.11.1.
d3033d3a        53344   v1.11.1         Build 1.11.1
f772a268        53346   v1.11.2-rc1     1.11.1 → 1.11.2.
5033435a        53411   v1.11.2         Build 1.11.2.
16e27047        53412   v1.11.3-rc1     1.11.2 → 1.11.3.

master-1.10:

778bc232        48969   v1.10.0-rc1     1.9.3 → 1.10.0.
86317435        49790   v1.10.0         Build 1.10.0.
f17c9adc        49792   v1.10.1-rc1     1.10.0 → 1.10.1.
85fa7bb6        50921   v1.10.1         Build 1.10.1.
e936be85        50937   v1.10.2-rc1     1.10.1 → 1.10.2.
b18db33c        51934   v1.10.2         Build 1.10.2.
1f3d99b0        51940   v1.10.3-rc1     1.10.2 → 1.10.3.
e5565e21        53022   v1.10.3         Build 1.10.3.
3a2b9711        53031   v1.10.4-rc1     1.10.3 → 1.10.2. #oops
cdbdf634        54184   v1.10.4         Build 1.10.4.
1075910c        54192   v1.10.5-rc1     1.10.4 → 1.10.5.
429f3cdf        54262   v1.10.5         Build 1.10.5.
2db69cb2        54273   v1.10.6-rc1     1.10.5 → 1.10.6.

master-1.8:

9204b554        43121   v1.8.0-rc1      1.7.2 → 1.8.0rc1.
94b4b51b        43431   v1.8.0          Build 1.8.0.
3d490cea        43435   v1.8.1-rc1      1.8.0 → 1.8.1.
d6300500        43936   v1.8.1          Build 1.8.1.
bd774689        43951   v1.8.2-rc1      1.8.1 → 1.8.2.
db4cb963        44520   v1.8.2          Build 1.8.2.
f1d777a4        44532   v1.8.3-rc1      1.8.2 → 1.8.3.
91f63a25        45254   v1.8.3          Build 1.8.3.
e673547b        45262   v1.8.4-rc1      1.8.3 → 1.8.4.
0e1a1c74        46250   v1.8.4          Build 1.8.4.
e42c5163        46261   v1.8.5-rc1      1.8.4 → 1.8.5.
19e4a9cf        47350   v1.8.5          Build 1.8.5.
83126c61        47356   v1.8.6-rc1      1.8.5 → 1.8.6.
010fc586        48142   v1.8.6          Build 1.8.6.
23cae0c8        48154   v1.8.7-rc1      1.8.6 → 1.8.7.
208220c5        49382   v1.8.7          Build 1.8.7.
45bce5dc        49391   v1.8.8-rc1      1.8.7 → 1.8.8.
95a28786        49836   v1.8.8          Build 1.8.8.
c9c018e2        49842   v1.8.9-rc1      1.8.8 → 1.8.9.
3335b35d        50922   v1.8.9          Build 1.8.9.
40c50585        50938   v1.8.10-rc1     1.8.9 → 1.8.10.
5e212d72        51935   v1.8.10         Build 1.8.10.
fd3c660f        51941   v1.8.11-rc1     1.8.10 → 1.8.11.
aa8df629        53023   v1.8.11         Build 1.8.11.
365665de        53032   v1.8.12-rc1     1.8.11 → 1.8.12.
98bc3bc7        54185   v1.8.12         Build 1.8.12.
be039e36        54194   v1.8.13-rc1     1.8.12 → 1.8.13.
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe


___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe

  By Date           By Thread  

Current thread:
  • Git tags Gerald Combs (Jan 29)
    • Re: Git tags Bálint Réczey (Jan 29)
      • Re: Git tags Gerald Combs (Jan 29)
[ Nmap | Sec Tools | Mailing Lists | Site News | About/Contact | Advertising | Privacy ]
AlienVault