Fix test

Author: pascalgn

test/git.test.js

@@ -5,7 +5,7 @@ const { tmpdir } = require("../lib/common");
 
 async function init(dir) {
   await fse.mkdirs(dir);
-  await git.git(dir, "init");
+  await git.git(dir, "init", "-b", "main");
 }
 
 async function commit(dir, message = "C%d", count = 1) {
@@ -24,7 +24,7 @@ test("clone creates the target directory", async () => {
   await tmpdir(async path => {
     await init(`${path}/origin`);
     await commit(`${path}/origin`);
-    await git.clone(`${path}/origin`, `${path}/ws`, "master", 1);
+    await git.clone(`${path}/origin`, `${path}/ws`, "main", 1);
     expect(await fse.exists(`${path}/ws`)).toBe(true);
   });
 });
@@ -37,13 +37,13 @@ test("fetchUntilMergeBase finds the correct merge base", async () => {
     const base = await git.head(origin);
     await git.git(origin, "checkout", "-b", "br1");
     await commit(origin, "br1 %d", 20);
-    await git.git(origin, "checkout", "master");
-    await commit(origin, "master %d", 20);
+    await git.git(origin, "checkout", "main");
+    await commit(origin, "main %d", 20);
 
     const ws = `${path}/ws`;
     await git.clone(`${path}/origin`, ws, "br1");
-    await git.fetch(ws, "master");
-    expect(await git.fetchUntilMergeBase(ws, "master", 10000)).toBe(base);
+    await git.fetch(ws, "main");
+    expect(await git.fetchUntilMergeBase(ws, "main", 10000)).toBe(base);
   });
 }, 15000);
 
@@ -54,18 +54,18 @@ test("fetchUntilMergeBase finds the earliest merge base 1", async () => {
     await commit(origin, "base %d", 10);
     const base = await git.head(origin);
     await git.git(origin, "branch", "br1");
-    await commit(origin, "master %d", 10);
+    await commit(origin, "main %d", 10);
     await git.git(origin, "checkout", "br1");
     await commit(origin, "br1 before merge %d", 5);
-    await git.git(origin, "merge", "--no-ff", "master");
+    await git.git(origin, "merge", "--no-ff", "main");
     await commit(origin, "br1 after merge %d", 10);
-    await git.git(origin, "checkout", "master");
-    await commit(origin, "master after merge %d", 10);
+    await git.git(origin, "checkout", "main");
+    await commit(origin, "main after merge %d", 10);
 
     const ws = `${path}/ws`;
     await git.clone(`${path}/origin`, ws, "br1");
-    await git.fetch(ws, "master");
-    expect(await git.fetchUntilMergeBase(ws, "master", 10000)).toBe(base);
+    await git.fetch(ws, "main");
+    expect(await git.fetchUntilMergeBase(ws, "main", 10000)).toBe(base);
   });
 }, 15000);
 
@@ -77,33 +77,33 @@ test("fetchUntilMergeBase finds the earliest merge base 2", async () => {
     const base = await git.head(origin);
     await commit(origin, "base b%d", 5);
     await git.git(origin, "branch", "br1");
-    await commit(origin, "master %d", 10);
+    await commit(origin, "main %d", 10);
     await git.git(origin, "checkout", "br1");
     await commit(origin, "br1 before merge %d", 5);
-    await git.git(origin, "merge", "--no-ff", "master");
+    await git.git(origin, "merge", "--no-ff", "main");
     await commit(origin, "br1 after merge %d", 10);
-    await git.git(origin, "checkout", "master");
-    await commit(origin, "master after merge %d", 10);
+    await git.git(origin, "checkout", "main");
+    await commit(origin, "main after merge %d", 10);
     await git.git(origin, "checkout", "-b", "br2", base);
     await commit(origin, "br2");
     await git.git(origin, "checkout", "br1");
     await git.git(origin, "merge", "--no-ff", "br2");
 
     const ws = `${path}/ws`;
     await git.clone(`${path}/origin`, ws, "br1");
-    await git.fetch(ws, "master");
-    expect(await git.fetchUntilMergeBase(ws, "master", 10000)).toBe(base);
+    await git.fetch(ws, "main");
+    expect(await git.fetchUntilMergeBase(ws, "main", 10000)).toBe(base);
   });
 }, 15000);
 
 test("mergeCommits returns the correct commits", async () => {
   await tmpdir(async path => {
     await init(path);
-    await commit(path, "master %d", 2);
+    await commit(path, "main %d", 2);
     const head1 = await git.head(path);
     await git.git(path, "checkout", "-b", "branch", "HEAD^");
     const head2 = await git.head(path);
-    await git.git(path, "merge", "--no-ff", "master");
+    await git.git(path, "merge", "--no-ff", "main");
 
     const commits = await git.mergeCommits(path, "HEAD^");
     expect(commits).toHaveLength(1);