From d6e73f221c3e52ce6591cbd01621530e5f6fd703 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 13 Aug 2023 04:16:43 +0000
Subject: [PATCH] fix relative path resolution logic, add more path tests
---
quartz/bootstrap-cli.mjs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index adcdb9f..d00a242 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -86,8 +86,8 @@
},
concurrency: {
number: true,
- describe: "how many threads to use to parse notes"
- }
+ describe: "how many threads to use to parse notes",
+ },
}
function escapePath(fp) {
@@ -129,7 +129,7 @@
}
function gitPull(origin, branch) {
- const flags = ["-s", "recursive", "-X", "ours", "--no-edit"]
+ const flags = ["--no-rebase", "--autostash", "-s", "recursive", "-X", "ours", "--no-edit"]
spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
}
--
Gitblit v1.10.0