diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-04-16 11:00:29 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-04-16 18:17:23 +0000 |
| commit | 129d574d96556e32ce66a8056b53b289cf246461 (patch) | |
| tree | 80bc4c7486ed04270ee8b95d9f3037386f50d2d9 /tools | |
| parent | 10134e9453eef2dfb316bac6d66edc4b4438f706 (diff) | |
Add some notes to git-export-release.sh.
Add some notes about avoiding the use of git stash.
Change-Id: I441adef099e5d64834a73e9f0f260d00c21be585
Reviewed-on: https://code.wireshark.org/review/26973
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/git-export-release.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/git-export-release.sh b/tools/git-export-release.sh index 577e5ea2b0..eb670dbb2b 100755 --- a/tools/git-export-release.sh +++ b/tools/git-export-release.sh @@ -32,6 +32,20 @@ DESCRIPTION=$(git describe --abbrev=8 --match "v[1-9]*" ${COMMIT}) VERSION=${DESCRIPTION#v} STASH_POP=False +# We might be able to avoid stashing by doing one of the following: +# +# Use tar to append a new or updated version.conf to the archive. +# This would require detecting our local tar flavor (GNU or BSD) and +# constructing a compatible command. BSD tar appears to support inline +# inline filtering via `-a @- -s /^/wireshark-${VERSION} version.conf` +# or something similar. GNU tar appears to require that we write to +# a file and append to it. I'm not sure if we can add a path prefix. +# +# Use the 'export-subst' gitattribute along with +# 'git_description=$Format:...$' in version.conf. export-subst uses +# 'git log' formatting. I'm not sure if we can build $DESCRIPTION +# from that. + if [ "$COMMIT" == "HEAD" ] ; then echo "Adding description $DESCRIPTION" echo "git_description=$DESCRIPTION" >> version.conf |