diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-09-15 03:21:41 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-09-15 11:22:32 +0900 |
| commit | 585b15d75df525054cf46b79baf16498472a0e65 (patch) | |
| tree | 5dac8f2bb3fb19e9e1c6df614416c408460a16e4 | |
| parent | df4a4bd88c98a0b966d88ae825c14e891c5cfba2 (diff) | |
| download | ruby-585b15d75df525054cf46b79baf16498472a0e65.tar.gz | |
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.
| -rw-r--r-- | tool/lib/vcs.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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" |