diff --git a/lib/executor.rb b/lib/executor.rb index d00aaee..b161736 100644 --- a/lib/executor.rb +++ b/lib/executor.rb @@ -120,7 +120,7 @@ def handle_open(action) detail: "No changes after pinning — packages may already be at latest." ) end - @git.push(branch: spec.branch) + @git.push(branch: spec.branch, force: true) number = @gh.create_pr( branch: spec.branch, base: @base, title: spec.title, body: @body_renderer.call(spec), diff --git a/lib/git_client.rb b/lib/git_client.rb index 2966359..98fd0b6 100644 --- a/lib/git_client.rb +++ b/lib/git_client.rb @@ -46,7 +46,7 @@ def commit_all(message:) def push(branch:, force: false) argv = ["git", "push", "origin", "#{branch}:#{branch}"] - argv.push("--force-with-lease") if force + argv.push("--force") if force @runner.run!(*argv) nil end diff --git a/test/executor_test.rb b/test/executor_test.rb index bcc7d0a..021dcc5 100644 --- a/test/executor_test.rb +++ b/test/executor_test.rb @@ -150,7 +150,7 @@ def test_open_action_pins_pushes_and_creates_pr # Git operations: checkout fresh, commit, push. assert_equal [{branch: "importmap-updates/patch", base: "main"}], @git.checkouts assert_equal 1, @git.commits.size - assert_equal [{branch: "importmap-updates/patch", force: false}], @git.pushes + assert_equal [{branch: "importmap-updates/patch", force: true}], @git.pushes # gh create_pr called with planner-provided title and rendered body. assert_equal 1, @gh.created.size