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

ruby-changes:57754

From: Nobuyoshi <ko1@a...>
Date: Sun, 15 Sep 2019 11:27:31 +0900 (JST)
Subject: [ruby-changes:57754] 585b15d75d (master): make-snapshot: no merge commits in ChangeLog

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

From 585b15d75df525054cf46b79baf16498472a0e65 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 15 Sep 2019 03:21:41 +0900
Subject: make-snapshot: no merge commits in ChangeLog

Parents commit hashs in logs of merge commits are abbreviated to
necessary length depending on the repositories.  Exclude merge
commits from ChangeLog to make it stable.

diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb
index 250cd84..f8b78bc 100644
--- a/tool/lib/vcs.rb
+++ b/tool/lib/vcs.rb
@@ -623,7 +623,7 @@ class VCS https://github.com/ruby/ruby/blob/trunk/tool/lib/vcs.rb#L623
 
     def format_changelog(path, arg)
       env = {'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'}
-      cmd = %W"#{COMMAND} log --format=medium --notes=commits --topo-order"
+      cmd = %W"#{COMMAND} log --format=medium --notes=commits --topo-order --no-merges"
       date = "--date=iso-local"
       unless system(env, *cmd, date, chdir: @srcdir, out: NullDevice, exception: false)
         date = "--date=iso"
-- 
cgit v0.10.2


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

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