zaine/quartz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: allow updating when repository is generated from template

Browse Source
This commit is contained in:
saberzero1
2026-05-27 20:43:56 +02:00
parent 9e4d4518bd
commit f15aa0032a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quartz/cli/helpers.js
View File

@@ -34,7 +34,7 @@ export async function stashContentFolder(contentFolder) {
} }
export function gitPull(origin, branch) { export function gitPull(origin, branch) {
const flags = ["--no-rebase", "--autostash", "--no-edit"] const flags = ["--no-rebase", "--autostash", "--no-edit", "--allow-unrelated-histories"]
const out = spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" }) const out = spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
if (out.stderr) { if (out.stderr) {
throw new Error(styleText("red", `Error while pulling updates: ${out.stderr}`)) throw new Error(styleText("red", `Error while pulling updates: ${out.stderr}`))