From fd658ec821f07e0a2254fcd62ce29cc644d61302 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 31 May 2019 02:28:38 +0900
Subject: Define RUBY_FULL_REVISION

Only if the short revision differs from the full revision.
---
 tool/file2lastrev.rb | 5 +++--
 tool/make-snapshot   | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'tool')

diff --git a/tool/file2lastrev.rb b/tool/file2lastrev.rb
index 24fbaeb0d7..1e2a6fc440 100755
--- a/tool/file2lastrev.rb
+++ b/tool/file2lastrev.rb
@@ -54,9 +54,10 @@ vcs = nil
     }
   when :revision_h
     Proc.new {|last, changed, modified, branch, title|
+      short = vcs.short_revision(last)
       [
-        "#define RUBY_REVISION #{vcs.short_revision(last).dump}",
-        "#define RUBY_FULL_REVISION #{last.dump}",
+        "#define RUBY_REVISION #{short.inspect}",
+        ("#define RUBY_FULL_REVISION #{last.inspect}" unless short == last),
         if branch
           e = '..'
           limit = 16
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 57eb195d1c..3e90adba48 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -291,7 +291,13 @@ def package(vcs, rev, destdir, tmp = nil)
     v = v[0]
   end
 
-  open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision.dump}"}
+  open("#{v}/revision.h", "wb") {|f|
+    short = vcs.short_revision(revision)
+    f.puts "#define RUBY_REVISION #{short.inspect}"
+    unless short == revision
+      f.puts "#define RUBY_FULL_REVISION #{revision.inspect}"
+    end
+  }
   version ||= (versionhdr = IO.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1]
   version ||=
     begin
-- 
cgit v1.2.3