From e7296d5208ad98dfba9aa109d58df9bcbeb05f4d Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Fri, 27 Aug 2021 10:55:30 -0700
Subject: [PATCH] Packaging: Try to fix git-export-release.sh.

Attempting to release 3.5.0 failed with

No local changes to save
Creating ./wireshark-3.5.0.tar.xz
fatal: not a valid object name: stash@{0}

Use CI_COMMIT_SHA for our export commit if it exists.
---
 packaging/source/git-export-release.sh.in | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packaging/source/git-export-release.sh.in b/packaging/source/git-export-release.sh.in
index 310e30133e..77066e8707 100755
--- a/packaging/source/git-export-release.sh.in
+++ b/packaging/source/git-export-release.sh.in
@@ -44,21 +44,24 @@ if [ -f "${DESTDIR}/wireshark-$VERSION.tar.xz" ] ; then
     exit 0
 fi
 
-STASH_POP=false
-XZ_OPTS=
-
 COMMIT="HEAD"
-if ! git diff-index --quiet HEAD ; then
+if [ -n "$CI_COMMIT_SHA" ] ; then
+    COMMIT=$CI_COMMIT_SHA
+fi
+
+STASH_POP=false
+if ! git diff-index "$COMMIT" ; then
     git stash --keep-index
     COMMIT="stash@{0}"
     STASH_POP=true
 fi
 
-echo "Creating ${DESTDIR}/wireshark-$VERSION.tar.xz"
+echo "Creating ${DESTDIR}/wireshark-$VERSION.tar.xz from $COMMIT"
 
+XZ_OPTS=
 echo . | xz --threads=0 > /dev/null 2>&1 && XZ_OPTS=--threads=0
 
-git archive --prefix="wireshark-${VERSION}/" ${COMMIT} | xz $XZ_OPTS > "${DESTDIR}/wireshark-${VERSION}.tar.xz"
+git archive --prefix="wireshark-${VERSION}/" "$COMMIT" | xz $XZ_OPTS > "${DESTDIR}/wireshark-${VERSION}.tar.xz"
 
 if $STASH_POP ; then
     git stash pop