From a8e289374a3162d98ec58833550c40e44092179b Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 18 Feb 2015 03:43:14 +0000 Subject: version.c: last commit title * version.c (ruby_show_version): show last commit title, if different than the trunk. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/vcs.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tool/vcs.rb') diff --git a/tool/vcs.rb b/tool/vcs.rb index 1e087b6542..9d11b3b8c1 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -260,6 +260,7 @@ class VCS logcmd << "--grep=^ *git-svn-id: .*@[0-9][0-9]*" idpat = /git-svn-id: .*?@(\d+) \S+\Z/ log = IO.pread(logcmd) + commit = log[/\Acommit (\w+)/, 1] last = log[idpat, 1] if path cmd = logcmd @@ -271,7 +272,9 @@ class VCS end modified = log[/^Date:\s+(.*)/, 1] branch = IO.pread(gitcmd + %W[symbolic-ref HEAD])[%r'\A(?:refs/heads/)?(.+)', 1] - [last, changed, modified, branch] + title = IO.pread(gitcmd + ["log", "--format=%s", "-n1", "#{commit}..HEAD"]) + title = nil if title.empty? + [last, changed, modified, branch, title] end Branch = Struct.new(:to_str) -- cgit v1.2.3