Can use --format=%b for just the body bit

lib/omnibus/git_cache.rb

@@ -32,7 +32,7 @@ class GitCache
     # will not have the generated content, so these snapshots would be
     # incompatible with the current omnibus codebase. Incrementing the serial
     # number ensures these old shapshots will not be used in subsequent builds.
-    SERIAL_NUMBER = 3
+    SERIAL_NUMBER = 4
 
     REQUIRED_GIT_FILES = %w{
 HEAD
@@ -207,14 +207,13 @@ def find_hardlinks
       hardlinks
     end
 
-    # Restores any hardlinking from the commit message 'metadata'
+    # Restores any hardlinking from the commit message body.  Body is assumed to
+    # be the JSON encoded return value from #find_hardlinks.
     #
     # @return true
     def restore_hardlinks
-      log.warn(log_key) { "Restoring hardlinks now" }
-      message = git_cmd("log --format=%B -n 1").stdout
-      json = message.sub(%r{Backup of .*?\n\n}, "")
-      hardlinks = FFI_Yajl::Parser.parse(json)
+      body = git_cmd("log --format=%b -n 1").stdout
+      hardlinks = FFI_Yajl::Parser.parse(body)
 
       hardlinks.each do |source, dest|
         dest.each do |path|