Merge branch 'maint-0.4.7'

2 files changed, 7 insertions, 1 deletions

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 8871154c9c..db6cd261e3 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -371,7 +371,6 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
             hooray "Distcheck was successful. Nothing further will be done."
             # We have to exit early here, since we can't do any other tests.
             cp tor-*.tar.gz "${CI_SRCDIR}"/artifacts
-            exit 0
         else
             error "Diagnostics:"
             runcmd make show-distdir-testlog || true
@@ -379,6 +378,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
             die "Unable to continue."
         fi
         end_section Distcheck
+        exit 0
     fi
 fi
 
diff --git a/scripts/maint/code-format.sh b/scripts/maint/code-format.sh
index d8f597d70d..5998e96f68 100755
--- a/scripts/maint/code-format.sh
+++ b/scripts/maint/code-format.sh
@@ -160,11 +160,17 @@ if [[ $GITIDX = 1 ]]; then
     # partially staged.
     note "Stashing unstaged changes"
     git stash -q --keep-index
+    # For some reasons, shellcheck is not seeing that we can call this
+    # function from the trap below.
+    # shellcheck disable=SC2317
     function restoregit() {
         note "Restoring git state"
         git stash pop -q
     }
 else
+    # For some reasons, shellcheck is not seeing that we can call this
+    # function from the trap below.
+    # shellcheck disable=SC2317
     function restoregit() {
         true
     }