[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3e25b3328f1813b0824648586e999bf920737398
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

3e25b33 by Peter Wu (peter@xxxxxxxxxxxxx):

    version: include version information for tarballs from git
    
    Embed the git commit hash as well as the tag information for tarballs
    produced by 'git archive' (this includes the Github tarball). Example:
    
        TShark (Wireshark) 3.0.1 (Git commit ea351cd80516)
    
    Note that the embedded git ref names can include branch information, see
    for example `git log -n1 -s --format=%D v3.0.1`:
    
        tag: wireshark-3.0.1, tag: v3.0.1
        HEAD -> bug/15544, tag: v99.99
        HEAD, origin/master, origin/HEAD, master
    
    Thus, when creating release tarballs, I would recommend using the above
    command to see whether unnecessary branch information is present. If so,
    create a new post-release commit first on the same branch. This way, the
    release tarballs should be reproducible.
    
    While at it, increase the commit abbreviation length from 8 to 12.
    Currently git describe abbreviates to 10 by default. The default length
    is at minimum 7 and is dependent on the number of objects:
    
        git count-objects -v | perl -lne 'print int(log($1)/log(2)/2)+1 if /^in-pack: (\d+)/'
    
    Bug: 15544
    Change-Id: Ifd1ed636b69f7687a7272775686f51387040a596
    Reviewed-on: https://code.wireshark.org/review/33214
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Dario Lombardo <lomato@xxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    (cherry picked from commit a68627ae96994ce56fd4ff9e7255cd0104851abe)
    Reviewed-on: https://code.wireshark.org/review/33235
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  d5d6a42   In pcapng_open(), don't use the local pcapng_t once we know it's a pcapng file.
     add  3e25b33   version: include version information for tarballs from git


Summary of changes:
 .gitattributes        |  1 +
 tools/make-version.pl | 29 ++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)