@multiplatform.one/cli 7.23.0 → 7.23.1

package/lib/commands/merge.mjs

@@ -11,7 +11,7 @@ import { tmpdir } from "node:os";
 *   ours   = the project's HEAD (every commit the project made)
 *   theirs = the scaffold it is moving to
 *
-* `git merge-tree --write-tree --merge-base=<base>` merges the scaffold's
+* `git merge-tree --write-tree` (git 2.38+) merges the scaffold's
 * evolution with the project's history; the result lands in the index and
 * worktree, never in a commit, so the project commits when it is happy.
 * `.updateignore` entries (exact files or directory prefixes, not globs) and
@@ -296,6 +296,14 @@ async function mergeScaffolds(request) {
 	const head = await gitOut(projectDir, ["rev-parse", "HEAD"]);
 	const baseCommit = request.baseDir ? await commitTreeFromDir(projectDir, request.baseDir, request.baseLabel) : await emptyCommit(projectDir, request.baseLabel);
 	const nextCommit = await commitTreeFromDir(projectDir, request.theirsDir, request.theirsLabel, baseCommit);
+	const oursCommit = await gitOut(projectDir, [
+		"commit-tree",
+		`${head}^{tree}`,
+		"-p",
+		baseCommit,
+		"-m",
+		"HEAD"
+	]);
 	let mergedTree;
 	let conflicts = [];
 	try {
@@ -303,8 +311,7 @@ async function mergeScaffolds(request) {
 			"merge-tree",
 			"--write-tree",
 			"--name-only",
-			`--merge-base=${baseCommit}`,
-			head,
+			oursCommit,
 			nextCommit
 		])).split("\n")[0].trim();
 	} catch (err) {

package/lib/source.json

@@ -1,5 +1,5 @@
 {
-  "cliVersion": "7.23.0",
+  "cliVersion": "7.23.1",
   "url": "https://git.corp.bitspur.com/multiplatform.one/mpo.git",
-  "sha": "bbb1b53984fb27eae564916820ed36fa54989197"
+  "sha": "89886a8f78197534fdfb5aaa348d0e1e242d94f7"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/cli",
-  "version": "7.23.0",
+  "version": "7.23.1",
   "description": "multiplatform.one cli — mpo init clones and prunes the monorepo, mpo update merges it back",
   "keywords": [
     "create-multiplatform-app",
@@ -56,7 +56,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@multiplatform.one/utils": "7.23.0",
+    "@multiplatform.one/utils": "7.23.1",
     "commander": "^14.0.3",
     "dotenv": "^17.4.2",
     "inquirer": "^13.4.2",

package/src/commands/merge.spec.ts

@@ -1,5 +1,9 @@
-import { describe, expect, it } from "vitest";
-import { threeWayMergePackageJson } from "./merge";
+import { chmodSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import spawn from "nano-spawn";
+import { afterEach, describe, expect, it } from "vitest";
+import { gitOut, mergeScaffolds, threeWayMergePackageJson } from "./merge";
 
 const json = (value: unknown) => JSON.stringify(value, null, 2);
 
@@ -79,3 +83,54 @@ describe("threeWayMergePackageJson", () => {
     });
   });
 });
+
+describe("mergeScaffolds on git 2.38 and 2.39, whose merge-tree has no --merge-base", () => {
+  const scratch: string[] = [];
+  const path = process.env.PATH;
+
+  afterEach(() => {
+    process.env.PATH = path;
+    for (const dir of scratch.splice(0)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  function tempDir(files: Record<string, string> = {}): string {
+    const dir = mkdtempSync(join(tmpdir(), "mpo-merge-spec-"));
+    scratch.push(dir);
+    for (const [name, content] of Object.entries(files)) writeFileSync(join(dir, name), content);
+    return dir;
+  }
+
+  it("merges the scaffold's change into the project through history alone", async () => {
+    const shim = tempDir({
+      git: `#!/bin/sh\nfor arg in "$@"; do\n  case $arg in --merge-base*) exit 129 ;; esac\ndone\nPATH='${path}' exec git "$@"\n`,
+    });
+    chmodSync(join(shim, "git"), 0o755);
+
+    const project = tempDir({ "a.txt": "one\n", "b.txt": "b\n", "mine.txt": "mine\n" });
+    await spawn("git", ["init", "--quiet"], { cwd: project });
+    await spawn("git", ["config", "user.email", "spec@example.com"], { cwd: project });
+    await spawn("git", ["config", "user.name", "Spec"], { cwd: project });
+    await spawn("git", ["add", "-A"], { cwd: project });
+    await spawn("git", ["commit", "--quiet", "-m", "project"], { cwd: project });
+
+    process.env.PATH = `${shim}:${path}`;
+    await expect(
+      spawn("git", ["merge-tree", "--write-tree", "--merge-base=HEAD", "HEAD", "HEAD"], {
+        cwd: project,
+      }),
+    ).rejects.toMatchObject({ exitCode: 129 });
+
+    const outcome = await mergeScaffolds({
+      projectDir: project,
+      baseDir: tempDir({ "a.txt": "one\n", "b.txt": "b\n" }),
+      theirsDir: tempDir({ "a.txt": "two\n", "b.txt": "b\n" }),
+      baseLabel: "scaffold 1",
+      theirsLabel: "scaffold 2",
+    });
+
+    expect(outcome.conflicts).toEqual([]);
+    expect(outcome.changed).toBe(true);
+    expect(await gitOut(project, ["show", `${outcome.mergedTree}:a.txt`])).toBe("two");
+    expect(await gitOut(project, ["show", `${outcome.mergedTree}:mine.txt`])).toBe("mine");
+  });
+});

package/src/commands/merge.ts

@@ -5,7 +5,7 @@
  *   ours   = the project's HEAD (every commit the project made)
  *   theirs = the scaffold it is moving to
  *
- * `git merge-tree --write-tree --merge-base=<base>` merges the scaffold's
+ * `git merge-tree --write-tree` (git 2.38+) merges the scaffold's
  * evolution with the project's history; the result lands in the index and
  * worktree, never in a commit, so the project commits when it is happy.
  * `.updateignore` entries (exact files or directory prefixes, not globs) and
@@ -324,6 +324,17 @@ export async function mergeScaffolds(request: MergeRequest): Promise<MergeOutcom
     request.theirsLabel,
     baseCommit,
   );
+  // merge-tree reads --merge-base only from git 2.40, and Debian bookworm
+  // ships 2.39. HEAD's tree on a commit parented by the base hands it the
+  // same base through history instead.
+  const oursCommit = await gitOut(projectDir, [
+    "commit-tree",
+    `${head}^{tree}`,
+    "-p",
+    baseCommit,
+    "-m",
+    "HEAD",
+  ]);
 
   let mergedTree: string;
   let conflicts: string[] = [];
@@ -332,8 +343,7 @@ export async function mergeScaffolds(request: MergeRequest): Promise<MergeOutcom
       "merge-tree",
       "--write-tree",
       "--name-only",
-      `--merge-base=${baseCommit}`,
-      head,
+      oursCommit,
       nextCommit,
     ]);
     mergedTree = out.split("\n")[0]!.trim();

package/types/commands/merge.d.ts

@@ -5,7 +5,7 @@
  *   ours   = the project's HEAD (every commit the project made)
  *   theirs = the scaffold it is moving to
  *
- * `git merge-tree --write-tree --merge-base=<base>` merges the scaffold's
+ * `git merge-tree --write-tree` (git 2.38+) merges the scaffold's
  * evolution with the project's history; the result lands in the index and
  * worktree, never in a commit, so the project commits when it is happy.
  * `.updateignore` entries (exact files or directory prefixes, not globs) and

package/types/commands/merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAOH,wBAAsB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,wCAKzF;AAED,wBAAsB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,mBAG5F;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIpE;AAED,+EAA+E;AAC/E,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUzF;AAuED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAkBrD;AA2ED;0EAC0E;AAC1E,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAerC;AAwDD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,8FAA8F;AAC9F,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA2DjF;AAED;2DAC2D;AAC3D,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9E;AAED,gFAAgF;AAChF,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CAuBf"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAOH,wBAAsB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,wCAKzF;AAED,wBAAsB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,mBAG5F;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAIpE;AAED,+EAA+E;AAC/E,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUzF;AAuED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAkBrD;AA2ED;0EAC0E;AAC1E,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAerC;AAwDD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,8FAA8F;AAC9F,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAqEjF;AAED;2DAC2D;AAC3D,wBAAsB,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9E;AAED,gFAAgF;AAChF,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CAuBf"}