jekyll-git_metadata 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3014ab1dbe6939519a268f017994fc5402dcf78
-  data.tar.gz: 8ac69a4517a11d9376d208a432c49779dec58415
+  metadata.gz: b813696c94afeaf1e861955b9802afd3cf6eb347
+  data.tar.gz: 82358ca6380277c0342e86e3093a055c106b9548
 SHA512:
-  metadata.gz: aedc7a9c9eb90b13a2f40376f6ff75cb7fef94f1589a0eba33b505fcd2e0774838aae9ddc8f24d9aac9118ad652253b5be59ecd6d1a208d86ffae25dc34939a5
-  data.tar.gz: a48999e28a7a543206258ea9f87b441640ca49be840927c60ee97d7e0fd17edd8cf0f8ea21a22e60da1df42ee51cde28f0b69e4476275302642e778e905a5b3c
+  metadata.gz: 1258b6c80cc76d95cc47d37a887d8f8b56f170a4880aad835c2d4cd6142f47ef36a0e128989bcda3713760ea64d7fade3d456c22c3f9eb9da305643ef63aa67c
+  data.tar.gz: 4ba19e3fad9f65a3af60eaed845ad56e6d5e4ad35218fbf6c140bf481d5b70f5255bb2abb795db6858bf96f48d79d62b4d7f7632c6e507acff67bf6c39fdfbd8

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
-before_script: sudo apt-get update && sudo apt-get install git
+sudo: required
+dist: trusty
 script: bundle exec rake test
 

data/lib/jekyll/git_metadata/generator.rb

@@ -10,23 +10,51 @@ module Jekyll
         raise "Git is not installed" unless git_installed?
 
         Dir.chdir(site.source) do
-          site.config['git'] = site_data
-          (site.pages + site.posts.docs).each do |page|
+          data = load_git_metadata(site)
+          site.config['git'] = data['site_data']
+          jekyll_items(site).each do |page|
             if page.is_a?(Jekyll::Page)
               path = page.path
             else
               path = page.relative_path
             end
-            page.data['git'] = page_data(path)
+            page.data['git'] = data['pages_data'][path]
           end
         end
+      end
+
+      def load_git_metadata(site)
+
+        current_sha = %x{ git rev-parse HEAD }.strip
+
+        cache_dir = site.source + '/.git-metadata'
+        FileUtils.mkdir_p(cache_dir) unless File.directory?(cache_dir)
+        cache_file = cache_dir + "/#{current_sha}.json"
 
+        if File.exist?(cache_file)
+          return JSON.parse(IO.read(cache_file))
+        end
+
+        pages_data = {}
+        jekyll_items(site).each do |page|
+          if page.is_a?(Jekyll::Page)
+            path = page.path
+          else
+            path = page.relative_path
+          end
+          pages_data[path] = page_data(path)
+        end
+        data = { 'site_data' => site_data, 'pages_data' => pages_data }
+
+        File.open(cache_file, 'w') { |f| f.write(data.to_json) }
+
+        data
       end
 
       def site_data
         {
           'project_name' => project_name,
-          'files_count' => files_count
+          'files_count' => files_count,
         }.merge!(page_data)
       end
 
@@ -105,6 +133,12 @@ module Jekyll
         null = RbConfig::CONFIG['host_os'] =~ /msdos|mswin|djgpp|mingw/ ? 'NUL' : '/dev/null'
         system "git --version >>#{null} 2>&1"
       end
+
+      private
+
+      def jekyll_items(site)
+        site.pages + site.collections.values.map(&:docs).flatten
+      end
     end
   end
 end

data/lib/jekyll/git_metadata/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module GitMetadata
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/test/helper.rb

@@ -5,11 +5,15 @@ require 'mocha/mini_test'
 require 'jekyll'
 require 'jekyll-git_metadata'
 
-class Minitest::Test
-  def jekyll_test_repo_path
-    File.join(File.dirname(__FILE__), 'test_repo')
-  end
+def jekyll_test_repo_path
+  File.join(File.dirname(__FILE__), 'test_repo')
+end
 
+def remove_cache_dir
+  FileUtils.rm_rf(File.join(jekyll_test_repo_path, '.git-metadata'))
+end
+
+class Minitest::Test
   def dot_git_path
     File.join(jekyll_test_repo_path, 'dot_git')
   end

data/test/test_git_metadata.rb

@@ -1,5 +1,9 @@
 require 'helper'
 
+Minitest.after_run do
+  remove_cache_dir
+end
+
 class Jekyll::GitMetadataTest < Minitest::Test
   context 'GitMetadata' do
 
@@ -29,19 +33,20 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
 
       should 'have correct files count' do
-        assert_equal 13, @site_data['files_count']
+        assert_equal 14, @site_data['files_count']
       end
 
       should 'have correct totals count' do
-        assert_equal 6, @site_data['total_commits']
-        assert_equal 674, @site_data['total_additions']
+        assert_equal 7, @site_data['total_commits']
+        assert_equal 688, @site_data['total_additions']
         assert_equal 11, @site_data['total_subtractions']
       end
 
       should 'have correct authors data' do
-        assert_equal 2, @site_data['authors'].count
+        assert_equal 3, @site_data['authors'].count
         assert @site_data['authors'].include?({"commits"=>5, "name"=>"Ivan Tse", "email"=>"ivan.tse1@gmail.com"})
         assert @site_data['authors'].include?({"commits"=>1, "name"=>"LeBron James", "email"=>"lbj@example.com"})
+        assert @site_data['authors'].include?({"commits"=>1, "name"=>"Mark Morga", "email"=>"mmorga@rackspace.com"})
       end
 
       should 'have correct first commit data' do
@@ -57,16 +62,15 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
 
       should 'have correct last commit data' do
-        assert_equal '2410dac', @site_data['last_commit']['short_sha']
-        assert_equal '2410dac67d5dc5f47a6d790edfed4f65acd9477b', @site_data['last_commit']['long_sha']
-        assert_equal 'Ivan Tse', @site_data['last_commit']['author_name']
-        assert_equal 'ivan.tse1@gmail.com', @site_data['last_commit']['author_email']
-        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @site_data['last_commit']['author_date']
-        assert_equal 'Ivan Tse', @site_data['last_commit']['commit_name']
-        assert_equal 'ivan.tse1@gmail.com', @site_data['last_commit']['commit_email']
-        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @site_data['last_commit']['commit_date']
-        assert_equal "This is a long commit message\n\nAs you can tell this commit message will span several lines long because\nI need to test long comit messages too!", @site_data['last_commit']['message']
-        assert_equal ["_posts/2014-07-14-welcome-to-jekyll.markdown", "about.md"], @site_data['last_commit']['changed_files']
+        assert_equal 'b8ffd38', @site_data['last_commit']['short_sha']
+        assert_equal 'b8ffd38affdd1cc22ee4cb830cbe5c398b4e3df1', @site_data['last_commit']['long_sha']
+        assert_equal 'Mark Morga', @site_data['last_commit']['author_name']
+        assert_equal 'mmorga@rackspace.com', @site_data['last_commit']['author_email']
+        assert_equal 'Tue Jun 20 11:36:43 2017 -0500', @site_data['last_commit']['author_date']
+        assert_equal 'Mark Morga', @site_data['last_commit']['commit_name']
+        assert_equal 'mmorga@rackspace.com', @site_data['last_commit']['commit_email']
+        assert_equal 'Tue Jun 20 11:36:43 2017 -0500', @site_data['last_commit']['commit_date']
+        assert_equal 'Adding example collection doc for git metadata', @site_data['last_commit']['message']
       end
     end
 
@@ -101,15 +105,16 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
 
       should 'have correct last commit data' do
-        assert_equal '2410dac', @page_data['last_commit']['short_sha']
-        assert_equal '2410dac67d5dc5f47a6d790edfed4f65acd9477b', @page_data['last_commit']['long_sha']
+        assert_equal '70343eb', @page_data['last_commit']['short_sha']
+        assert_equal '70343eb1287191b30371400048167253a883d6ca', @page_data['last_commit']['long_sha']
         assert_equal 'Ivan Tse', @page_data['last_commit']['author_name']
         assert_equal 'ivan.tse1@gmail.com', @page_data['last_commit']['author_email']
-        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @page_data['last_commit']['author_date']
+        assert_equal 'Sun Feb 12 02:21:26 2017 -0500', @page_data['last_commit']['author_date']
         assert_equal 'Ivan Tse', @page_data['last_commit']['commit_name']
         assert_equal 'ivan.tse1@gmail.com', @page_data['last_commit']['commit_email']
-        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @page_data['last_commit']['commit_date']
+        assert_equal 'Sun Feb 12 02:21:26 2017 -0500', @page_data['last_commit']['commit_date']
         assert_equal "This is a long commit message\n\nAs you can tell this commit message will span several lines long because\nI need to test long comit messages too!", @page_data['last_commit']['message']
+        assert_equal ["_posts/2014-07-14-welcome-to-jekyll.markdown", "about.md"], @page_data['last_commit']['changed_files']
       end
     end
 
@@ -143,15 +148,16 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
 
       should 'have correct last commit data' do
-        assert_equal '2410dac', @page_data['last_commit']['short_sha']
-        assert_equal '2410dac67d5dc5f47a6d790edfed4f65acd9477b', @page_data['last_commit']['long_sha']
+        assert_equal '70343eb', @page_data['last_commit']['short_sha']
+        assert_equal '70343eb1287191b30371400048167253a883d6ca', @page_data['last_commit']['long_sha']
         assert_equal 'Ivan Tse', @page_data['last_commit']['author_name']
         assert_equal 'ivan.tse1@gmail.com', @page_data['last_commit']['author_email']
-        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @page_data['last_commit']['author_date']
+        assert_equal 'Sun Feb 12 02:21:26 2017 -0500', @page_data['last_commit']['author_date']
         assert_equal 'Ivan Tse', @page_data['last_commit']['commit_name']
         assert_equal 'ivan.tse1@gmail.com', @page_data['last_commit']['commit_email']
-        assert_equal 'Sun Feb 12 01:00:51 2017 -0500', @page_data['last_commit']['commit_date']
+        assert_equal 'Sun Feb 12 02:21:26 2017 -0500', @page_data['last_commit']['commit_date']
         assert_equal "This is a long commit message\n\nAs you can tell this commit message will span several lines long because\nI need to test long comit messages too!", @page_data['last_commit']['message']
+        assert_equal ["_posts/2014-07-14-welcome-to-jekyll.markdown", "about.md"], @page_data['last_commit']['changed_files']
       end
     end
 
@@ -176,5 +182,46 @@ class Jekyll::GitMetadataTest < Minitest::Test
       end
     end
 
+    context 'collection doc data' do
+      setup do
+        @gizmo_page = @site.collections['gizmos'].docs.select{|p| p.relative_path == '_gizmos/yoyo.md'}.first
+        @page_data = @gizmo_page.data['git']
+      end
+
+      should 'have correct totals count' do
+        assert_equal 1, @page_data['total_commits']
+        assert_equal 9, @page_data['total_additions']
+        assert_equal 0, @page_data['total_subtractions']
+      end
+
+      should 'have correct authors data' do
+        assert_equal 1, @page_data['authors'].count
+        assert @page_data['authors'].include?({"commits"=>1, "name"=>"Mark Morga", "email"=>"mmorga@rackspace.com"})
+      end
+
+      should 'have correct first commit data' do
+        assert_equal 'b8ffd38', @page_data['first_commit']['short_sha']
+        assert_equal 'b8ffd38affdd1cc22ee4cb830cbe5c398b4e3df1', @page_data['first_commit']['long_sha']
+        assert_equal 'Mark Morga', @page_data['first_commit']['author_name']
+        assert_equal 'mmorga@rackspace.com', @page_data['first_commit']['author_email']
+        assert_equal 'Tue Jun 20 11:36:43 2017 -0500', @page_data['first_commit']['author_date']
+        assert_equal 'Mark Morga', @page_data['first_commit']['commit_name']
+        assert_equal 'mmorga@rackspace.com', @page_data['first_commit']['commit_email']
+        assert_equal 'Tue Jun 20 11:36:43 2017 -0500', @page_data['first_commit']['commit_date']
+        assert_equal 'Adding example collection doc for git metadata', @page_data['first_commit']['message']
+      end
+
+      should 'have correct last commit data' do
+        assert_equal 'b8ffd38', @page_data['last_commit']['short_sha']
+        assert_equal 'b8ffd38affdd1cc22ee4cb830cbe5c398b4e3df1', @page_data['last_commit']['long_sha']
+        assert_equal 'Mark Morga', @page_data['last_commit']['author_name']
+        assert_equal 'mmorga@rackspace.com', @page_data['last_commit']['author_email']
+        assert_equal 'Tue Jun 20 11:36:43 2017 -0500', @page_data['last_commit']['author_date']
+        assert_equal 'Mark Morga', @page_data['last_commit']['commit_name']
+        assert_equal 'mmorga@rackspace.com', @page_data['last_commit']['commit_email']
+        assert_equal 'Tue Jun 20 11:36:43 2017 -0500', @page_data['last_commit']['commit_date']
+        assert_equal 'Adding example collection doc for git metadata', @page_data['last_commit']['message']
+      end
+    end
   end
 end

data/test/test_repo/_config.yml

@@ -10,3 +10,8 @@ github_username:  ivantsepp
 # Build settings
 markdown: kramdown
 permalink: pretty
+
+# Testing collections
+collections:
+  gizmos:
+    output: true

data/test/test_repo/_gizmos/yoyo.md

@@ -0,0 +1,9 @@
+---
+layout: page
+title: Yoyo
+description: This is my first gizmo, a yoyo
+---
+# Yoyo
+
+This is a sample collection document that is published.
+

data/test/test_repo/dot_git/COMMIT_EDITMSG

@@ -1,14 +1 @@
-This is a long commit message
-
-As you can tell this commit message will span several lines long because
-I need to test long comit messages too!
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-# On branch master
-# Changes to be committed:
-#	modified:   _posts/2014-07-14-welcome-to-jekyll.markdown
-#	modified:   about.md
-#
-# Untracked files:
-#	dot_git/
-#
+Adding example collection doc for git metadata

data/test/test_repo/dot_git/ORIG_HEAD

@@ -0,0 +1 @@
+25d62f6feeb7190483f81564f4a76c1ec33d5118

data/test/test_repo/dot_git/logs/HEAD

@@ -4,3 +4,6 @@ da077394cb4d5bf7ffac527dbfc652ec0592b423 9e00340e45d33e52bb16100f1b613a36f82f9c5
 9e00340e45d33e52bb16100f1b613a36f82f9c57 8365a44c640d5c7cafc8788607a274dfd91b89bb Ivan Tse <ivan.tse1@gmail.com> 1405318203 -0400	commit: Edit first post
 8365a44c640d5c7cafc8788607a274dfd91b89bb 25d62f6feeb7190483f81564f4a76c1ec33d5118 Ivan Tse <ivan.tse1@gmail.com> 1405318351 -0400	commit: Be more friendly
 25d62f6feeb7190483f81564f4a76c1ec33d5118 2410dac67d5dc5f47a6d790edfed4f65acd9477b Ivan Tse <ivan.tse1@gmail.com> 1486879251 -0500	commit: This is a long commit message
+25d62f6feeb7190483f81564f4a76c1ec33d5118 25d62f6feeb7190483f81564f4a76c1ec33d5118 Ivan Tse <ivan.tse1@gmail.com> 1486884057 -0500	reset: moving to HEAD
+25d62f6feeb7190483f81564f4a76c1ec33d5118 70343eb1287191b30371400048167253a883d6ca Ivan Tse <ivan.tse1@gmail.com> 1486884086 -0500	commit: This is a long commit message
+70343eb1287191b30371400048167253a883d6ca b8ffd38affdd1cc22ee4cb830cbe5c398b4e3df1 Mark Morga <mmorga@rackspace.com> 1497976603 -0500	commit: Adding example collection doc for git metadata

data/test/test_repo/dot_git/logs/refs/heads/master

@@ -4,3 +4,5 @@ da077394cb4d5bf7ffac527dbfc652ec0592b423 9e00340e45d33e52bb16100f1b613a36f82f9c5
 9e00340e45d33e52bb16100f1b613a36f82f9c57 8365a44c640d5c7cafc8788607a274dfd91b89bb Ivan Tse <ivan.tse1@gmail.com> 1405318203 -0400	commit: Edit first post
 8365a44c640d5c7cafc8788607a274dfd91b89bb 25d62f6feeb7190483f81564f4a76c1ec33d5118 Ivan Tse <ivan.tse1@gmail.com> 1405318351 -0400	commit: Be more friendly
 25d62f6feeb7190483f81564f4a76c1ec33d5118 2410dac67d5dc5f47a6d790edfed4f65acd9477b Ivan Tse <ivan.tse1@gmail.com> 1486879251 -0500	commit: This is a long commit message
+25d62f6feeb7190483f81564f4a76c1ec33d5118 70343eb1287191b30371400048167253a883d6ca Ivan Tse <ivan.tse1@gmail.com> 1486884086 -0500	commit: This is a long commit message
+70343eb1287191b30371400048167253a883d6ca b8ffd38affdd1cc22ee4cb830cbe5c398b4e3df1 Mark Morga <mmorga@rackspace.com> 1497976603 -0500	commit: Adding example collection doc for git metadata

data/test/test_repo/dot_git/objects/32/fff15665e830f9bdd82ea46a906bd3cf1122b0

@@ -0,0 +1 @@
+x
5�1�0DQj�b$Z���9h({IVZg�x]8�!M��͢3n���{�$tm6�����	MxiW��Ɲ��n�+W|�;޼W��G��ht���?

data/test/test_repo/dot_git/objects/b8/ffd38affdd1cc22ee4cb830cbe5c398b4e3df1

@@ -0,0 +1,2 @@
+x
��Yj�0D�S�Z��@��!Z��cƲ���?��UT��W�j��_F�%eF�Y�Y��Ad�lVYmv�g3�.瀀�Y��Ġ��m�]�>��R��x&E���:ܩ?���F�^�_~v���E,o��h�B
+ޣ�W\�\����V�~n ?T�C��q���P�:����ʠB��/��ST

data/test/test_repo/dot_git/objects/e7/76acafd9b27ddcdd8e8a2c973b1fa1ccd690ab

@@ -0,0 +1,3 @@
+x
-��n�0D;�+.[;�ڡ��L
+t�EA۬�D�T�J����r���
+O���5[�|�RІ�\�|���"��M�];�&��J)�8���"����ȡz� �W3�u�~�Usq����ǴX9S��9���K�n?˽��7f륕q���M(uXD�k�Z��6Ƃ�U���LLeg�~�$z�-6�����#a�

data/test/test_repo/dot_git/refs/heads/master

@@ -1 +1 @@
-2410dac67d5dc5f47a6d790edfed4f65acd9477b
+b8ffd38affdd1cc22ee4cb830cbe5c398b4e3df1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-git_metadata
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Ivan Tse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -102,6 +102,7 @@ files:
 - test/test_git_metadata.rb
 - test/test_repo/.gitignore
 - test/test_repo/_config.yml
+- test/test_repo/_gizmos/yoyo.md
 - test/test_repo/_includes/footer.html
 - test/test_repo/_includes/head.html
 - test/test_repo/_includes/header.html
@@ -113,6 +114,8 @@ files:
 - test/test_repo/css/main.css
 - test/test_repo/dot_git/COMMIT_EDITMSG
 - test/test_repo/dot_git/HEAD
+- test/test_repo/dot_git/MERGE_RR
+- test/test_repo/dot_git/ORIG_HEAD
 - test/test_repo/dot_git/config
 - test/test_repo/dot_git/description
 - test/test_repo/dot_git/hooks/applypatch-msg.sample
@@ -129,17 +132,25 @@ files:
 - test/test_repo/dot_git/logs/HEAD
 - test/test_repo/dot_git/logs/refs/heads/master
 - test/test_repo/dot_git/objects/00/26c4c5df4d5148a07b9fbd790620f4e11d0802
+- test/test_repo/dot_git/objects/0a/842bc255214909543fb198145783107e735907
+- test/test_repo/dot_git/objects/0b/6d4b0cffe0117537f4ac31c918588c394778ef
 - test/test_repo/dot_git/objects/0e/a9d20342677512902dde3175a73e1dd1059e67
+- test/test_repo/dot_git/objects/13/30fa92b3c8d94ee3ebb645b04154e735c04cf1
+- test/test_repo/dot_git/objects/1a/24ab60234bd846f0f1532f914d66ea986fadbb
 - test/test_repo/dot_git/objects/25/d62f6feeb7190483f81564f4a76c1ec33d5118
 - test/test_repo/dot_git/objects/32/3a65e20f0feb846438bbda1a0396ea2db7616e
+- test/test_repo/dot_git/objects/32/fff15665e830f9bdd82ea46a906bd3cf1122b0
+- test/test_repo/dot_git/objects/3d/32f2f8ec3470e6a88ad1f9096e539cec42a47a
 - test/test_repo/dot_git/objects/3e/d64bb62b98b0827096cda5da5a728ec1bf5e3e
 - test/test_repo/dot_git/objects/48/d97759a460f607e077eea99a2df7b3cd5a2601
 - test/test_repo/dot_git/objects/4c/2dd956115a971f5376a998bc4b243022c8881e
 - test/test_repo/dot_git/objects/4d/1b13c2e1ef1c1a944aae52994682da833a5bef
 - test/test_repo/dot_git/objects/4d/7f8a4c1a1bac8d553ba169e18882a7f51235bd
 - test/test_repo/dot_git/objects/59/821b143fbc62850d08e3f70c70d02af08df684
+- test/test_repo/dot_git/objects/59/bc060e8c1fbe31c985e00c6cc2fef3b46c0c62
 - test/test_repo/dot_git/objects/60/9711c27d50b5ab6ecc7d8fd485082481f9fc4a
 - test/test_repo/dot_git/objects/62/61f5911f204a827c313081c33e2522f0dd457c
+- test/test_repo/dot_git/objects/70/343eb1287191b30371400048167253a883d6ca
 - test/test_repo/dot_git/objects/78/845656f899d0bfd86d2806b85b0c54adddd3c8
 - test/test_repo/dot_git/objects/7f/9eb0e6044998d71653c06fdc6e359dfbfc4211
 - test/test_repo/dot_git/objects/83/65a44c640d5c7cafc8788607a274dfd91b89bb
@@ -152,6 +163,7 @@ files:
 - test/test_repo/dot_git/objects/a9/f5097c614e0d4be7f900c04d782d3b1d675ee2
 - test/test_repo/dot_git/objects/ae/45638b71046b28d46a764d8a2f7780fec58c01
 - test/test_repo/dot_git/objects/af/415865cd1f1c0a5963a5d45b1335856e23dae8
+- test/test_repo/dot_git/objects/b8/ffd38affdd1cc22ee4cb830cbe5c398b4e3df1
 - test/test_repo/dot_git/objects/ba/a938862bbe45533863069649b40fdebf59e81c
 - test/test_repo/dot_git/objects/c0/8f9add7a1d48045bec46451dfdbb5b5ebf8dc0
 - test/test_repo/dot_git/objects/c8/f101653f2c1de3611232fc4c940246b06779cd
@@ -159,6 +171,7 @@ files:
 - test/test_repo/dot_git/objects/e1/ec08bcf36967f7be9ec6df51c862cc86305f4f
 - test/test_repo/dot_git/objects/e3/c2be348eb0873f7ac3f500ae6daaa93ebd7959
 - test/test_repo/dot_git/objects/e5/e6f26a0481e83434feb2de4ef29843c8a1b8b2
+- test/test_repo/dot_git/objects/e7/76acafd9b27ddcdd8e8a2c973b1fa1ccd690ab
 - test/test_repo/dot_git/objects/ff/74852f93c8e337b7ae3088c31cfe8673def356
 - test/test_repo/dot_git/refs/heads/master
 - test/test_repo/feed.xml
@@ -192,6 +205,7 @@ test_files:
 - test/test_git_metadata.rb
 - test/test_repo/.gitignore
 - test/test_repo/_config.yml
+- test/test_repo/_gizmos/yoyo.md
 - test/test_repo/_includes/footer.html
 - test/test_repo/_includes/head.html
 - test/test_repo/_includes/header.html
@@ -203,6 +217,8 @@ test_files:
 - test/test_repo/css/main.css
 - test/test_repo/dot_git/COMMIT_EDITMSG
 - test/test_repo/dot_git/HEAD
+- test/test_repo/dot_git/MERGE_RR
+- test/test_repo/dot_git/ORIG_HEAD
 - test/test_repo/dot_git/config
 - test/test_repo/dot_git/description
 - test/test_repo/dot_git/hooks/applypatch-msg.sample
@@ -219,17 +235,25 @@ test_files:
 - test/test_repo/dot_git/logs/HEAD
 - test/test_repo/dot_git/logs/refs/heads/master
 - test/test_repo/dot_git/objects/00/26c4c5df4d5148a07b9fbd790620f4e11d0802
+- test/test_repo/dot_git/objects/0a/842bc255214909543fb198145783107e735907
+- test/test_repo/dot_git/objects/0b/6d4b0cffe0117537f4ac31c918588c394778ef
 - test/test_repo/dot_git/objects/0e/a9d20342677512902dde3175a73e1dd1059e67
+- test/test_repo/dot_git/objects/13/30fa92b3c8d94ee3ebb645b04154e735c04cf1
+- test/test_repo/dot_git/objects/1a/24ab60234bd846f0f1532f914d66ea986fadbb
 - test/test_repo/dot_git/objects/25/d62f6feeb7190483f81564f4a76c1ec33d5118
 - test/test_repo/dot_git/objects/32/3a65e20f0feb846438bbda1a0396ea2db7616e
+- test/test_repo/dot_git/objects/32/fff15665e830f9bdd82ea46a906bd3cf1122b0
+- test/test_repo/dot_git/objects/3d/32f2f8ec3470e6a88ad1f9096e539cec42a47a
 - test/test_repo/dot_git/objects/3e/d64bb62b98b0827096cda5da5a728ec1bf5e3e
 - test/test_repo/dot_git/objects/48/d97759a460f607e077eea99a2df7b3cd5a2601
 - test/test_repo/dot_git/objects/4c/2dd956115a971f5376a998bc4b243022c8881e
 - test/test_repo/dot_git/objects/4d/1b13c2e1ef1c1a944aae52994682da833a5bef
 - test/test_repo/dot_git/objects/4d/7f8a4c1a1bac8d553ba169e18882a7f51235bd
 - test/test_repo/dot_git/objects/59/821b143fbc62850d08e3f70c70d02af08df684
+- test/test_repo/dot_git/objects/59/bc060e8c1fbe31c985e00c6cc2fef3b46c0c62
 - test/test_repo/dot_git/objects/60/9711c27d50b5ab6ecc7d8fd485082481f9fc4a
 - test/test_repo/dot_git/objects/62/61f5911f204a827c313081c33e2522f0dd457c
+- test/test_repo/dot_git/objects/70/343eb1287191b30371400048167253a883d6ca
 - test/test_repo/dot_git/objects/78/845656f899d0bfd86d2806b85b0c54adddd3c8
 - test/test_repo/dot_git/objects/7f/9eb0e6044998d71653c06fdc6e359dfbfc4211
 - test/test_repo/dot_git/objects/83/65a44c640d5c7cafc8788607a274dfd91b89bb
@@ -242,6 +266,7 @@ test_files:
 - test/test_repo/dot_git/objects/a9/f5097c614e0d4be7f900c04d782d3b1d675ee2
 - test/test_repo/dot_git/objects/ae/45638b71046b28d46a764d8a2f7780fec58c01
 - test/test_repo/dot_git/objects/af/415865cd1f1c0a5963a5d45b1335856e23dae8
+- test/test_repo/dot_git/objects/b8/ffd38affdd1cc22ee4cb830cbe5c398b4e3df1
 - test/test_repo/dot_git/objects/ba/a938862bbe45533863069649b40fdebf59e81c
 - test/test_repo/dot_git/objects/c0/8f9add7a1d48045bec46451dfdbb5b5ebf8dc0
 - test/test_repo/dot_git/objects/c8/f101653f2c1de3611232fc4c940246b06779cd
@@ -249,6 +274,7 @@ test_files:
 - test/test_repo/dot_git/objects/e1/ec08bcf36967f7be9ec6df51c862cc86305f4f
 - test/test_repo/dot_git/objects/e3/c2be348eb0873f7ac3f500ae6daaa93ebd7959
 - test/test_repo/dot_git/objects/e5/e6f26a0481e83434feb2de4ef29843c8a1b8b2
+- test/test_repo/dot_git/objects/e7/76acafd9b27ddcdd8e8a2c973b1fa1ccd690ab
 - test/test_repo/dot_git/objects/ff/74852f93c8e337b7ae3088c31cfe8673def356
 - test/test_repo/dot_git/refs/heads/master
 - test/test_repo/feed.xml