From df4a4bd88c98a0b966d88ae825c14e891c5cfba2 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 15 Sep 2019 02:16:15 +0900
Subject: make-snapshot: export ChangeLog from srcdir

---
 tool/lib/vcs.rb    | 3 ---
 tool/make-snapshot | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index 780ae346e1..250cd848fa 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -584,9 +584,6 @@ class VCS
 
     def export(revision, url, dir, keep_temp = false)
       system(COMMAND, "clone", "-c", "advice.detachedHead=false", "-s", (@srcdir || '.').to_s, "-b", url, dir) or return
-      unless system(COMMAND, "fetch", "origin", "+refs/notes/commits:refs/notes/commits", chdir: dir, exception: false)
-        warn "No notes/commits tree"
-      end
       (Integer === revision ? GITSVN : GIT).new(File.expand_path(dir))
     end
 
diff --git a/tool/make-snapshot b/tool/make-snapshot
index cdda44c67d..28fc724a87 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -278,7 +278,7 @@ def package(vcs, rev, destdir, tmp = nil)
   v = "ruby"
   puts "Exporting #{rev}@#{revision}"
   exported = tmp ? File.join(tmp, v) : v
-  unless vcs = vcs.export(revision, url, exported, true) {|line| print line}
+  unless vcs.export(revision, url, exported, true) {|line| print line}
     warn("Export failed")
     return
   end
@@ -348,7 +348,7 @@ def package(vcs, rev, destdir, tmp = nil)
     n = "ruby-#{version}-#{tag}"
   end
   File.directory?(n) or File.rename v, n
-  vcs.chdir(File.expand_path(v = n))
+  v = n
 
   system(*%W"patch -d #{v} -p0 -i #{$patch_file}") if $patch_file
   def (clean = []).add(n) push(n); n end
-- 
cgit v1.2.3