Commit 17efb77
committed
sync_default_gems.yml: Pull --rebase before push
It was supposed to update a local branch in case the remote branch was
updated between actions/checkout and the end of tool/sync_default_gems.rb.
Note that this `git pull` didn't exist in the original bin/update-default-gem.sh
ruby/git.ruby-lang.org@d9e9bcc,
so it was newly introduced at ruby@3ba5cfd.
But `git pull --no-ff` failed when master had updates in an unrelated
repository. I think we need to use `git pull --rebase` instead.
This fixes:
* https://github.com/ruby/ruby/actions/runs/19207693793/job/54905403070
* checkout: f08030e
* ruby tool/sync_default_gems.rb net-http ec9c70a6fba75a63c128864ef3cb32c883665a33..e4d80bd609f22cad04a2e2c1d54c981bb853c938
* pull: 2bf82c61 parent f1b1899 commit 17efb77
1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| |||
0 commit comments