summaryrefslogtreecommitdiff
path: root/tool/redmine-backporter.rb
diff options
context:
space:
mode:
authorTakashi Kokubun <[email protected]>2024-09-02 02:25:28 -0700
committerTakashi Kokubun <[email protected]>2024-09-02 02:25:29 -0700
commitb6e7e903a09e1577adc2f17600ca40dee80a0534 ()
tree99619a043a5f6d975193a0c0c97aa01f68fca6dc /tool/redmine-backporter.rb
parent7d47f3c94f4c38f9b236716c9f98b928895d6b2d (diff)
redmine-backporter: Support matching multiple revs
with `done` command
-rwxr-xr-xtool/redmine-backporter.rb14
1 files changed, 7 insertions, 7 deletions
@@ -353,14 +353,14 @@ eom
if rev && has_commit(rev, "ruby_#{TARGET_VERSION.tr('.','_')}")
notes = "ruby_#{TARGET_VERSION.tr('.','_')} commit:#{rev}."
- elsif rev.nil? && (log = find_git_log("##@issue]")) && /^commit (?<rev>\h{40})$/ =~ log
- str = log[/merge revision\(s\) ([^:]+)(?=:)/]
- if str
- str.sub!(/\Amerge/, 'merged')
- str.gsub!(/\h{8,40}/, 'commit:\0')
- str = "ruby_#{TARGET_VERSION.tr('.','_')} commit:#{rev} #{str}."
else
- str = "ruby_#{TARGET_VERSION.tr('.','_')} commit:#{rev}."
end
if notes
str << "\n"