From 3a2eae0a16cfc275182f8a26af0a77f0e9bd07c1 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 04 Aug 2023 06:24:34 +0000
Subject: [PATCH] fix fetch flags
---
quartz/bootstrap-cli.mjs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 4013a20..dd10232 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -10,7 +10,7 @@
import { intro, isCancel, outro, select, text } from "@clack/prompts"
import { rimraf } from "rimraf"
import prettyBytes from "pretty-bytes"
-import { spawnSync } from "child_process"
+import { execSync, spawnSync } from "child_process"
import { transform as cssTransform } from "lightningcss"
const ORIGIN_NAME = "origin"
@@ -121,10 +121,8 @@
}
function gitPull(origin, branch) {
- spawnSync("git", ["fetch", origin, branch], { stdio: "inherit" })
- spawnSync("git", ["checkout", `${origin}/${branch}`, "--", ":(exclude)content"], {
- stdio: "inherit",
- }).error
+ const flags = ["-s", "recursive", "-X", "ours"]
+ spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
}
yargs(hideBin(process.argv))
@@ -249,6 +247,7 @@
console.log(
"Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.",
)
+ execSync(`git remote add upstream https://github.com/jackyzha0/quartz.git`, { stdio: "ignore" })
gitPull(UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH)
await popContentFolder(contentFolder)
console.log("Ensuring dependencies are up to date")
--
Gitblit v1.10.0