From ffb6c3e1de8cad147c1bc12759094c173ea41bfa Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Fri, 22 Nov 2024 19:18:14 +0100
Subject: [PATCH] ci/deqp: simplify generating the version description file

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28168>
---
 .gitlab-ci/container/build-deqp.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index cca2d88ce27..47566ff3585 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -142,20 +142,16 @@ do
   GIT_COMMITTER_DATE=$(date -d@0) git am < $OLDPWD/.gitlab-ci/container/patches/$patch
 done
 
-if [ "$DEQP_VERSION" = "$DEQP_MAIN_COMMIT" ]; then
-  {
+{
+  if [ "$DEQP_VERSION" = "$DEQP_MAIN_COMMIT" ]; then
     commit_desc=$(git show --no-patch --format='commit %h on %ci' --abbrev=10 "$DEQP_COMMIT")
     echo "dEQP main at $commit_desc"
-    echo "The following local patches are applied on top:"
-    git log --reverse --oneline "$DEQP_COMMIT".. --format='- %s'
-  } > /deqp-$deqp_api/version
-else
-  {
+  else
     echo "dEQP base version $DEQP_VERSION"
-    echo "The following local patches are applied on top:"
-    git log --reverse --oneline "$DEQP_COMMIT".. --format='- %s'
-  } > /deqp-$deqp_api/version
-fi
+  fi
+  echo "The following local patches are applied on top:"
+  git log --reverse --oneline "$DEQP_COMMIT".. --format='- %s'
+} > /deqp-$deqp_api/version
 
 # --insecure is due to SSL cert failures hitting sourceforge for zlib and
 # libpng (sigh).  The archives get their checksums checked anyway, and git