Trim some resources

[rbdr/blog] / lib / remotes / git.js

diff --git a/lib/remotes/git.js b/lib/remotes/git.js
index d8e0cfd63e4a30e625a80abddc5ce8125a0b730d..32230aeb2ab5fad4c469a6a4e7b8bb8abfcf7388 100644 (file)
--- a/lib/remotes/git.js
+++ b/lib/remotes/git.js
@@ -1,29 +1,33 @@
 const { exec } = require('child_process');
-const { debuglog, promisify } = require('util');
+const { promisify } = require('util');
 
 const internals = {
   // Promisified functions
   exec: promisify(exec),
-
-  debuglog: debuglog('blog'),
 };
 
 module.exports = {
   canHandle() {
+
     // For the future: actually check if it's a valid git url
     return true;
   },
 
   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`);
   },
 
   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`);
   }