From c8c108c7f702ca3710733d6d455ca2661e13e8d3 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 02 Aug 2023 06:29:58 +0000
Subject: [PATCH] change default strategy to be rebase
---
quartz/components/pages/FolderContent.tsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index 66a1adb..ea7ab5e 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -11,8 +11,8 @@
const { tree, fileData, allFiles } = props
const folderSlug = canonicalizeServer(fileData.slug!)
const allPagesInFolder = allFiles.filter((file) => {
- const fileSlug = file.slug ?? ""
- const prefixed = fileSlug.startsWith(folderSlug)
+ const fileSlug = canonicalizeServer(file.slug!)
+ const prefixed = fileSlug.startsWith(folderSlug) && fileSlug !== folderSlug
const folderParts = folderSlug.split(path.posix.sep)
const fileParts = fileSlug.split(path.posix.sep)
const isDirectChild = fileParts.length === folderParts.length + 1
--
Gitblit v1.10.0