test: change git utils to async/await

Minor cleanups in git utils code

Author: alan-agius4

tests/legacy-cli/e2e/utils/git.ts

@@ -1,37 +1,33 @@
 import { git, silentGit } from './process';
 
-export function gitClean() {
+export async function gitClean(): Promise<void> {
   console.log('  Cleaning git...');
-  return silentGit('clean', '-df')
-    .then(() => silentGit('reset', '--hard'))
-    .then(() => {
-      // Checkout missing files
-      return silentGit('status', '--porcelain')
-        .then(({ stdout }) =>
-          stdout
-            .split(/[\n\r]+/g)
-            .filter((line) => line.match(/^ D/))
-            .map((line) => line.replace(/^\s*\S+\s+/, '')),
-        )
-        .then((files) => silentGit('checkout', ...files));
-    })
-    .then(() => expectGitToBeClean());
+
+  await silentGit('clean', '-df');
+  await silentGit('reset', '--hard');
+
+  // Checkout missing files
+  const { stdout } = await silentGit('status', '--porcelain');
+  const files = stdout
+    .split(/[\n\r]+/g)
+    .filter((line) => line.match(/^ D/))
+    .map((line) => line.replace(/^\s*\S+\s+/, ''));
+
+  await silentGit('checkout', ...files);
+  await expectGitToBeClean();
 }
 
-export function expectGitToBeClean() {
-  return silentGit('status', '--porcelain').then(({ stdout }) => {
-    if (stdout != '') {
-      throw new Error('Git repo is not clean...\n' + stdout);
-    }
-  });
+export async function expectGitToBeClean(): Promise<void> {
+  const { stdout } = await silentGit('status', '--porcelain');
+  if (stdout != '') {
+    throw new Error('Git repo is not clean...\n' + stdout);
+  }
 }
 
-export function gitCommit(message: string) {
-  return git('add', '-A')
-    .then(() => silentGit('status', '--porcelain'))
-    .then(({ stdout }) => {
-      if (stdout != '') {
-        return git('commit', '-am', message);
-      }
-    });
+export async function gitCommit(message: string): Promise<void> {
+  await git('add', '-A');
+  const { stdout } = await silentGit('status', '--porcelain');
+  if (stdout != '') {
+    await git('commit', '-am', message);
+  }
 }