summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-09-03 11:31:14 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-09-03 11:33:29 +0900
commit542a1ade8033d03513647ace64e50dbf31cb5e68 (patch)
tree449106db8f69dab8583878fbeebd47886e880881 /tool
parent703f0cd3d007f1ada69957a529870b07fa053230 (diff)
--date=iso-local does not work with old git
Diffstat (limited to 'tool')
-rw-r--r--tool/lib/vcs.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index 620ac1bfeb..65eb774d38 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -618,9 +618,15 @@ class VCS
end
def format_changelog(path, arg)
- cmd = %W"#{COMMAND} log --format=medium --notes=commits --date=iso-local --topo-order"
+ env = {'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'}
+ cmd = %W"#{COMMAND} log --format=medium --notes=commits --topo-order"
+ date = "--date=iso-local"
+ unless system(env, *cmd, date, chdir: @srcdir, out: NullDevice, exception: false)
+ date = "--date=iso"
+ end
+ cmd << date
cmd.concat(arg)
- system({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'}, *cmd, chdir: @srcdir, out: path)
+ system(env, *cmd, chdir: @srcdir, out: path)
end
def upstream