From 71f4383d18a3980bf70c9848b1d7156a4eaaba0b Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Thu, 29 Oct 2015 15:44:38 -0500
Subject: [PATCH] Fix #4075: Make sure that .jekyll-metadata is not generated
 when not needed.

---
 lib/jekyll/regenerator.rb |  4 +++-
 test/test_regenerator.rb  | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/regenerator.rb b/lib/jekyll/regenerator.rb
index 911ca18b..2d84ee34 100644
--- a/lib/jekyll/regenerator.rb
+++ b/lib/jekyll/regenerator.rb
@@ -130,7 +130,9 @@ module Jekyll
     #
     # Returns nothing.
     def write_metadata
-      File.binwrite(metadata_file, Marshal.dump(metadata))
+      unless disabled?
+        File.binwrite(metadata_file, Marshal.dump(metadata))
+      end
     end
 
     # Produce the absolute path of the metadata file
diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb
index 52268f26..c9dfb573 100644
--- a/test/test_regenerator.rb
+++ b/test/test_regenerator.rb
@@ -305,4 +305,23 @@ class TestRegenerator < JekyllUnitTest
       assert @regenerator.modified?(@path)
     end
   end
+
+  context "when incremental regen is disabled" do
+    setup do
+      FileUtils.rm_rf(source_dir(".jekyll-metadata"))
+      @site = Site.new(Jekyll.configuration({
+        "source" => source_dir,
+        "destination" => dest_dir,
+        "incremental" => false
+      }))
+
+      @site.process
+      @path = @site.in_source_dir(@site.pages.first.path)
+      @regenerator = @site.regenerator
+    end
+
+    should "not create .jekyll-metadata" do
+      refute File.file?(source_dir(".jekyll-metadata"))
+    end
+  end
 end