From 585b15d75df525054cf46b79baf16498472a0e65 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada 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. --- tool/lib/vcs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tool/lib/vcs.rb') diff --git a/tool/lib/vcs.rb b/tool/lib/vcs.rb index 250cd848fa..f8b78bc2f6 100644 --- a/tool/lib/vcs.rb +++ b/tool/lib/vcs.rb @@ -623,7 +623,7 @@ class VCS 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 v1.2.3