From a760e21bc122c67478b318b3f032d70fac1a6077 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Wed, 29 May 2024 10:33:20 -0700 Subject: [PATCH] Sort backport revisions by commit timestamps --- tool/redmine-backporter.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tool/redmine-backporter.rb b/tool/redmine-backporter.rb index bbd85d0e19..3f5c6feca9 100755 --- a/tool/redmine-backporter.rb +++ b/tool/redmine-backporter.rb @@ -191,10 +191,12 @@ def backport_command_string # check if the Git revision is included in master has_commit(c, "master") + end.sort_by do |changeset| + Integer(IO.popen(%W[git show -s --format=%ct #{changeset}], &:read)) end @changesets.define_singleton_method(:validated){true} end - "#{merger_path} --ticket=#{@issue} #{@changesets.sort.join(',')}" + "#{merger_path} --ticket=#{@issue} #{@changesets.join(',')}" end def status_char(obj)