DEV: Don't create backups during version bumps (#25484)

2024-01-30 11:41:15 -07:00 · 2024-01-30 11:41:15 -07:00 · 491e7a3429
parent a4022f69f3
commit 491e7a3429
1 changed files with 2 additions and 1 deletions
--- a/lib/tasks/version_bump.rake
+++ b/lib/tasks/version_bump.rake
@ -340,7 +340,8 @@ task "version_bump:major_stable_merge", [:version_bump_ref] do |t, args|

    git "merge", "--no-commit", merge_ref, allow_failure: true

-    out, status = Open3.capture2e "git diff --binary #{merge_ref} | patch -p1 -R"
+    out, status =
+      Open3.capture2e "git diff --binary #{merge_ref} | patch -p1 -R --no-backup-if-mismatch"
    raise "Error applying diff\n#{out}}" unless status.success?

    git "add", "."