Skip to content
Snippets Groups Projects
Commit c5b983c9 authored by Gerald Combs's avatar Gerald Combs
Browse files

Packaging: Ignore the return value of git stash.

Make sure we don't trigger '-e'.

[skip ci]
parent 0bde1e79
Branches
Tags v3.7.0
No related merge requests found
......@@ -74,12 +74,13 @@ fi
COMMIT="${CI_COMMIT_SHA:-HEAD}"
STASH_ID=$(git stash create)
STASH_ID=$(git stash create || echo "")
if [[ -n "$STASH_ID" ]] ; then
COMMIT="$STASH_ID"
fi
if [ -f "$TARBALL" ] ; then
printf "Found %s\\n" "$TARBALL"
if TARBALL_ID=$(git get-tar-commit-id < <(xzcat "$TARBALL")) && COMMIT_ID=$(git rev-parse --verify "$COMMIT") ; then
if [[ $TARBALL_ID == "$COMMIT_ID" ]] ; then
echo "$TARBALL commit ID matches $COMMIT."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment