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