From cc7978f3bc9645d5759e2481f73ac1886ea1e470 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@users.noreply.github.com>
Date: Fri, 15 Mar 2019 23:08:12 +0530
Subject: [PATCH] Optimize Document::DATE_FILENAME_MATCHER to match valid
 filenames (#7292)

Merge pull request 7292
---
 lib/jekyll/document.rb                                    | 2 +-
 test/source/_posts/2013-03-19-not-a-post/dubious.markdown | 6 ++++++
 test/test_site.rb                                         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 test/source/_posts/2013-03-19-not-a-post/dubious.markdown

diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 3c2499da..a8fda1e8 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -12,7 +12,7 @@ module Jekyll
 
     YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
     DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!.freeze
-    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{2,4}-\d{1,2}-\d{1,2})-(.*)(\.[^.]+)$!.freeze
+    DATE_FILENAME_MATCHER = %r!^(?>.+/)*?(\d{2,4}-\d{1,2}-\d{1,2})-([^/]*)(\.[^.]+)$!.freeze
 
     # Create a new Document.
     #
diff --git a/test/source/_posts/2013-03-19-not-a-post/dubious.markdown b/test/source/_posts/2013-03-19-not-a-post/dubious.markdown
new file mode 100644
index 00000000..cd2990d7
--- /dev/null
+++ b/test/source/_posts/2013-03-19-not-a-post/dubious.markdown
@@ -0,0 +1,6 @@
+---
+title: What Am I?
+---
+
+I am not a post.
+Am I a document then..?
diff --git a/test/test_site.rb b/test/test_site.rb
index 15cebaf3..c8166fed 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -95,7 +95,7 @@ class TestSite < JekyllUnitTest
   context "creating sites" do
     setup do
       @site = Site.new(site_configuration)
-      @num_invalid_posts = 5
+      @num_invalid_posts = 6
     end
 
     teardown do