From 663c41fa41faad1528335a18c73a197ed5c6ea11 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 03 Aug 2023 06:04:26 +0000
Subject: [PATCH] use posix style paths for all path ops
---
quartz/bootstrap-cli.mjs | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 0bf27aa..21449f5 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -49,12 +49,6 @@
default: true,
describe: "push updates to your Quartz fork",
},
- force: {
- boolean: true,
- alias: ["f"],
- default: true,
- describe: "whether to apply the --force flag to git commands",
- },
pull: {
boolean: true,
default: true,
@@ -247,7 +241,9 @@
console.log(
"Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.",
)
- spawnSync("git", ["rebase", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
+ spawnSync("git", ["pull", "--rebase", "--autostash", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], {
+ stdio: "inherit",
+ })
await popContentFolder(contentFolder)
console.log("Ensuring dependencies are up to date")
spawnSync("npm", ["i"], { stdio: "inherit" })
@@ -272,7 +268,9 @@
console.log(
"Pulling updates from your repository. You may need to resolve some `git` conflicts if you've made changes to components or plugins.",
)
- spawnSync("git", ["rebase", "origin", QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
+ spawnSync("git", ["pull", "--rebase", "--autostash", "origin", QUARTZ_SOURCE_BRANCH], {
+ stdio: "inherit",
+ })
}
await popContentFolder(contentFolder)
--
Gitblit v1.10.0