X-Git-Url: https://git.r.bdr.sh/rbdr/blog/blobdiff_plain/f91c2b4feb85933bc190712b45788d2f24fe851d..9eac24780006862171b85858b40db0f29f494e76:/lib/remotes/git.js?ds=sidebyside diff --git a/lib/remotes/git.js b/lib/remotes/git.js index 11fdab8..32230ae 100644 --- a/lib/remotes/git.js +++ b/lib/remotes/git.js @@ -15,7 +15,7 @@ module.exports = { async syncUp(remote, blogDirectory) { - await internals.exec(`cd ${blogDirectory} && git init`); + await internals.exec(`cd ${blogDirectory} && git init -b main`); await internals.exec(`cd ${blogDirectory} && git add .`); await internals.exec(`cd ${blogDirectory} && git commit --allow-empty -m blog-sync-up-${Date.now()}`); await internals.exec(`cd ${blogDirectory} && git push ${remote} main --force`); @@ -23,8 +23,11 @@ module.exports = { async syncDown(remote, blogDirectory) { - await internals.exec(`cd ${blogDirectory} && git init`); - await internals.exec(`cd ${blogDirectory} && git checkout .`); + await internals.exec(`cd ${blogDirectory} && git init -b main`); + try { + await internals.exec(`cd ${blogDirectory} && git checkout .`); + } + catch {} await internals.exec(`cd ${blogDirectory} && git clean . -f`); await internals.exec(`cd ${blogDirectory} && git pull ${remote} main`); }