[前][次][番号順一覧][スレッド一覧]

ruby-changes:57755

From: Nobuyoshi <ko1@a...>
Date: Sun, 15 Sep 2019 11:27:32 +0900 (JST)
Subject: [ruby-changes:57755] df4a4bd88c (master): make-snapshot: export ChangeLog from srcdir

https://git.ruby-lang.org/ruby.git/commit/?id=df4a4bd88c

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


diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index 780ae34..250cd84 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -584,9 +584,6 @@ class VCS https://github.com/ruby/ruby/blob/trunk/tool/lib/vcs.rb#L584
 
     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 cdda44c..28fc724 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -278,7 +278,7 @@ def package(vcs, rev, destdir, tmp = nil) https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L278
   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) https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L348
     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 v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]