From 2527eed26354dd18090b3de29f7fa0f7a1872540 Mon Sep 17 00:00:00 2001 From: Michael Hackner Date: Sun, 27 Sep 2026 13:31:20 -0700 Subject: fix: make release test robust to diff.noPrefix git config (#4663) `git apply` by default expects `-p1`, which is the default behavior of `git diff`, but this can be overridden by config. Specify it explicitly so it works regardless. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 64ae182b..2991afe7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -455,7 +455,7 @@ jobs: exit 0 fi # Apply only release preparation, never the hotfix implementation or newer master code. - git diff --binary "$PREVIEW_COMMIT" "$GITHUB_REF_NAME" > "$RUNNER_TEMP/release-preparation.patch" + git diff --binary --default-prefix "$PREVIEW_COMMIT" "$GITHUB_REF_NAME" > "$RUNNER_TEMP/release-preparation.patch" if [ -s "$RUNNER_TEMP/release-preparation.patch" ]; then git apply --3way --index "$RUNNER_TEMP/release-preparation.patch" fi -- cgit v1.2.3