From c3cd8edb362a35a58b515622b2715af517dedfbe Mon Sep 17 00:00:00 2001
From: Helio Machado <0x2b3bfa0+git@googlemail.com>
Date: Tue, 6 Dec 2022 23:33:02 +0000
Subject: [PATCH] Fix merge issues

---
 src/cml.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cml.js b/src/cml.js
index edc92f5f9..d527c2245 100644
--- a/src/cml.js
+++ b/src/cml.js
@@ -586,20 +586,20 @@ class CML {
 
       if (url) return renderPr(url);
     } else {
-      await exec(`git checkout -b ${source}`);
-      await exec(`git fetch ${remote} ${sha}`);
-      await exec(`git checkout -B ${target} ${sha}`);
+      await exec('git', 'fetch', remote, sha);
+      await exec('git', 'checkout', '-b', source);
+      await exec('git', 'checkout', '-B', target, sha);
 
       if (paths.length) {
-        await exec(`git add ${paths.join(' ')}`);
+        await exec('git', 'add', paths.join(' '));
         let commitMessage = message || `CML PR for ${shaShort}`;
         if (skipCi || (!message && !(merge || rebase || squash))) {
           commitMessage += ' [skip ci]';
         }
-        await exec(`git commit -m "${commitMessage}"`);
+        await exec('git', 'commit', '-m', commitMessage);
       }
 
-      await exec(`git push --set-upstream ${remote} ${source}`);
+      await exec('git', 'push', '--set-upstream', remote, source);
     }
 
     const url = await driver.prCreate({