From 3fe529c95a55cf7d25d1ef73d53f790710c9a352 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 6 Sep 2024 13:25:13 +0200
Subject: [PATCH] container: make the non-debug output nicer

---
 container/cmd | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/container/cmd b/container/cmd
index 4b2b4f5..425beff 100755
--- a/container/cmd
+++ b/container/cmd
@@ -78,8 +78,8 @@ if test "$GITHUB_EVENT_NAME" = 'pull_request'; then
     git config --global advice.detachedHead false
     git config --global init.defaultBranch main
 
+    echo "## New code: $INPUT_PULL_REQUEST_HEAD ##"
     (
-        echo "## Checking out $INPUT_PULL_REQUEST_HEAD ##"
         $debug_mode || exec &>/dev/null
         git fetch origin "+$INPUT_PULL_REQUEST_HEAD:refs/remotes/pull-requests/pr-detached-$INPUT_PULL_REQUEST_ID"
         git checkout "$INPUT_PULL_REQUEST_HEAD"
@@ -90,6 +90,7 @@ if test "$GITHUB_EVENT_NAME" = 'pull_request'; then
 
     # Get the last commit before this PR.
     last_committed=$(git rev-parse "HEAD~$INPUT_PULL_REQUEST_COMMITS")
+    echo "## Old code: $last_committed ##"
     linter_options+=( --compare-against "$last_committed" )
 
     test -z "$INPUT_SUBDIRECTORY" || INPUT_SUBDIRECTORIES=$INPUT_SUBDIRECTORY
@@ -100,8 +101,12 @@ if test "$GITHUB_EVENT_NAME" = 'pull_request'; then
         analyze_subdir "$subdir"
     done
 
-    # Return back to the previous git-sha1
-    git checkout "$GITHUB_SHA"
+    (
+        # Return back to the previous git-sha1, upload-sarif action doesn't
+        # really like mismatches.
+        $debug_mode || exit &>/dev/null
+        git checkout "$GITHUB_SHA"
+    )
 else
     touch "$rootdir/output.sarif.err"
 fi