hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-29 18:41:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix unsafe stash handling in run-test.sh

Browse Source 
Only stash when there are actual changes (including untracked files),
and only pop the specific stash entry we created.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Paolo Tranquilli
2026-05-27 08:13:04 +02:00
parent 5fe938a534
commit 76047ad883
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rust/ql/lib/upgrades/66a489863649185f4a9770f894505803059a1312/test/run-test.sh
View File

@@ -18,13 +18,22 @@ trap 'rm -rf "$OLD_TEST_TMP"' EXIT
cp "$SCRIPT_DIR/old/OldShapes.ql" "$SCRIPT_DIR/old/OldShapes.expected" "$OLD_TEST_TMP/"
cp "$SCRIPT_DIR/new/qlpack.yml" "$SCRIPT_DIR/new/upgrade_shapes.rs" "$OLD_TEST_TMP/"
echo "==> Stashing any uncommitted changes..."
git stash --quiet || true
# Stash changes only if there are any (including untracked files)
STASH_REF=""
if ! git diff --quiet HEAD || [ -n "$(git ls-files --others --exclude-standard)" ]; then
echo "==> Stashing uncommitted changes..."
STASH_REF=$(git stash create --include-untracked)
if [ -n "$STASH_REF" ]; then
git stash store -m "run-test.sh auto-stash" "$STASH_REF"
fi
fi
restore_branch() {
echo "==> Restoring original branch..."
git checkout --quiet -
git stash pop --quiet 2>/dev/null || true
if [ -n "$STASH_REF" ]; then
git stash pop --quiet
fi
}
trap 'restore_branch; rm -rf "$OLD_TEST_TMP"' EXIT