update pull strategy
This commit is contained in:
parent
a01301fb70
commit
a660922136
@ -50,10 +50,6 @@ title: Callouts
|
|||||||
>
|
>
|
||||||
> Aliases: failure, fail, missing
|
> Aliases: failure, fail, missing
|
||||||
|
|
||||||
> [!fail] Failure
|
|
||||||
>
|
|
||||||
> Aliases: failure, fail, missing
|
|
||||||
|
|
||||||
> [!danger] Error
|
> [!danger] Error
|
||||||
>
|
>
|
||||||
> Aliases: danger, error
|
> Aliases: danger, error
|
||||||
|
@ -121,10 +121,8 @@ async function popContentFolder(contentFolder) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function gitPull(origin, branch) {
|
function gitPull(origin, branch) {
|
||||||
spawnSync("git", ["fetch", origin, branch], { stdio: "inherit" })
|
const flags = ["-s", "recursive", "-X", "ours"]
|
||||||
spawnSync("git", ["checkout", `${origin}/${branch}`, "--", ":(exclude)content"], {
|
spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
|
||||||
stdio: "inherit",
|
|
||||||
}).error
|
|
||||||
}
|
}
|
||||||
|
|
||||||
yargs(hideBin(process.argv))
|
yargs(hideBin(process.argv))
|
||||||
|
Loading…
Reference in New Issue
Block a user