Use pushd and popd

Author: aidangarske

scripts/utils-general.sh

@@ -53,9 +53,7 @@ check_git_match() {
     local target_ref="$1"
     local repo_dir="${2:-.}"
 
-    # Save current directory and move to repo
-    local oldpwd="$PWD"
-    cd "$repo_dir" || return 2
+    pushd "$repo_dir" > /dev/null || return 2
 
     local current_tag current_branch current_commit_long current_commit_short
     current_tag=$(git describe --tags --exact-match 2>/dev/null || true)
@@ -65,25 +63,25 @@ check_git_match() {
 
     if [[ -n "$current_tag" && "$target_ref" == "$current_tag" ]]; then
         echo "match: tag ($current_tag)"
-        cd "$oldpwd"
+        popd > /dev/null
         return 0
     elif [[ -n "$current_branch" && "$target_ref" == "$current_branch" ]]; then
         echo "match: branch ($current_branch)"
-        cd "$oldpwd"
+        popd > /dev/null
         return 0
     elif [[ -n "$current_commit_long" && "$target_ref" == "$current_commit_long" ]]; then
         echo "match: commit (long $current_commit_long)"
-        cd "$oldpwd"
+        popd > /dev/null
         return 0
     elif [[ -n "$current_commit_short" && "$target_ref" == "$current_commit_short" ]]; then
         echo "match: commit (short $current_commit_short)"
-        cd "$oldpwd"
+        popd > /dev/null
         return 0
     else
         echo "no match found for $target_ref"
         printf "Version inconsistency. Please fix ${repo_dir}\n"
         printf "(expected: ${target_ref}, got: ${current_tag} ${current_branch} ${current_commit_long} ${current_commit_short})\n"
-        cd "$oldpwd"
+        popd > /dev/null
         exit 1
     fi
 }