Skip to content

Commit e65efd4

Browse files
committed
sync_default_gems: git <2.32 ignores --no-edit in cherry-pick
git/git@39edfd5 Gbp-Pq: Name sync_default_gems-git-2.32-ignores-no-edit-in-cherry-pick.patch
1 parent 926f943 commit e65efd4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tool/sync_default_gems.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ def pickup_commit(gem, sha, edit)
682682
if picked
683683
system(*%w"git commit --amend --no-edit")
684684
else
685-
system(*%w"git cherry-pick --continue --no-edit")
685+
system({'GIT_EDITOR' => 'true'}, *%w"git cherry-pick --continue")
686686
end or return nil
687687

688688
# Amend the commit if RDoc references need to be replaced

0 commit comments

Comments
 (0)