From db614dbf6d8c7f6e9ed315cd979500b131a5cc26 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sat, 27 Apr 2019 23:25:48 +0900
Subject: [PATCH] Support git-log format ChangeLog

---
 tool/make-snapshot | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tool/make-snapshot b/tool/make-snapshot
index 93b193910f..4e6818ac17 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -341,11 +341,14 @@ def package(vcs, rev, destdir, tmp = nil)
       # get last revision from previous ChangeLog archive
       last_ChangeLog = Dir["doc/ChangeLog-*"].grep(/-(\d+)\z/) {|n| [$1.to_i, n]}.max[1]
       open(last_ChangeLog) do |f|
-        f.readline
-        unless /\Ar(\d+) / =~ f.readline
+        if /\Acommit (\w+)/ =~ f.readline
+          beginning = $1
+        elsif /\Ar(\d+) / =~ f.readline
+          beginning = $1.to_i
+        else
           abort "#{File.basename $0}: Cannot find revision from '#{last_ChangeLog}'"
         end
-        vcs.export_changelog(url, $1.to_i, revision.to_i, "ChangeLog")
+        vcs.export_changelog(url, beginning, revision, "ChangeLog")
       end
     end