update pull strategy
This commit is contained in:
parent
4877a9c934
commit
93986c6e7c
@ -50,10 +50,6 @@ title: Callouts
|
||||
>
|
||||
> Aliases: failure, fail, missing
|
||||
|
||||
> [!fail] Failure
|
||||
>
|
||||
> Aliases: failure, fail, missing
|
||||
|
||||
> [!danger] Error
|
||||
>
|
||||
> Aliases: danger, error
|
||||
|
@ -121,10 +121,8 @@ async function popContentFolder(contentFolder) {
|
||||
}
|
||||
|
||||
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))
|
||||
|
Loading…
Reference in New Issue
Block a user