From 2acfb9e8701d2b001a82a6af75969a1df7d97b67 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 04 Aug 2023 06:08:04 +0000
Subject: [PATCH] format, add upstream
---
quartz/bootstrap-cli.mjs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 6387535..0bb078a 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,9 @@
console.log(
"Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.",
)
+ execSync(
+ `git remote show upstream || git remote add upstream https://github.com/jackyzha0/quartz.git`,
+ )
gitPull(UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH)
await popContentFolder(contentFolder)
console.log("Ensuring dependencies are up to date")
@@ -280,7 +281,7 @@
await popContentFolder(contentFolder)
if (argv.push) {
console.log("Pushing your changes")
- spawnSync("git", ["push", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
+ spawnSync("git", ["push", "-f", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
}
console.log(chalk.green("Done!"))
--
Gitblit v1.10.0