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

From 7ff2bfed92f8017184963eaac13e75cfb5ce5d4a Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 1 Jul 2019 23:16:47 +0900
Subject: Alias "master" and "trunk"


diff --git a/tool/make-snapshot b/tool/make-snapshot
index 8b60ee2..b166c72 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -42,7 +42,7 @@ options: https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L42
   -s3=PATH              s3 bucket path(default=tmp)
   -help, --help         show this message
 version:
-  trunk, stable, branches/*, tags/*, X.Y, X.Y.Z, X.Y.Z-pL
+  master, trunk, stable, branches/*, tags/*, X.Y, X.Y.Z, X.Y.Z-pL
 each versions may be followed by optional @revision.
 USAGE
 end
@@ -207,7 +207,7 @@ def package(vcs, rev, destdir, tmp = nil) https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L207
   case rev
   when nil
     url = nil
-  when /\Atrunk\z/
+  when /\A(?:master|trunk)\z/
     url = vcs.trunk
   when /\Abranches\//
     url = vcs.branch($')
diff --git a/tool/vcs.rb b/tool/vcs.rb
index 4554da3..dd6162c 100644
--- a/tool/vcs.rb
+++ b/tool/vcs.rb
@@ -326,6 +326,7 @@ class VCS https://github.com/ruby/ruby/blob/trunk/tool/vcs.rb#L326
     def trunk
       url + "trunk"
     end
+    alias master trunk
 
     def branch_list(pat)
       IO.popen(%W"#{COMMAND} ls #{branch('')}") do |f|
@@ -507,9 +508,10 @@ class VCS https://github.com/ruby/ruby/blob/trunk/tool/vcs.rb#L508
 
     alias tag branch
 
-    def trunk
-      branch("trunk")
+    def master
+      branch("master")
     end
+    alias trunk master
 
     def stable
       cmd = %W"#{COMMAND} for-each-ref --format=\%(refname:short) refs/heads/ruby_[0-9]*"
-- 
cgit v0.10.2


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