diff options
Diffstat (limited to 'tool/redmine-backporter.rb')
-rwxr-xr-x | tool/redmine-backporter.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tool/redmine-backporter.rb b/tool/redmine-backporter.rb index 757fe180bc..9d1f5fbe48 100755 --- a/tool/redmine-backporter.rb +++ b/tool/redmine-backporter.rb @@ -241,7 +241,7 @@ def find_svn_log(pattern) end def find_git_log(pattern) - `git #{RUBY_REPO_PATH ? "-C #{RUBY_REPO_PATH.shellecape}" : ""} log --grep="#{pattern}"` + `git #{RUBY_REPO_PATH ? "-C #{RUBY_REPO_PATH.shellescape}" : ""} log --grep="#{pattern}"` end def show_last_journal(http, uri) @@ -447,8 +447,12 @@ eom end if log && rev str = log[/merge revision\(s\) ([^:]+)(?=:)/] - str.insert(5, "d") - str = "ruby_#{TARGET_VERSION.tr('.','_')} #{rev} #{str}." + if str + str.insert(5, "d") + str = "ruby_#{TARGET_VERSION.tr('.','_')} #{rev} #{str}." + else + str = "ruby_#{TARGET_VERSION.tr('.','_')} #{rev}." + end if notes str << "\n" str << notes |