github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 18:53:44 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Isaac Janzen 2024-01-30 11:41:15 -07:00 committed by GitHub
parent a4022f69f3
commit 491e7a3429
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tasks/version_bump.rake
View File

@ -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", "."