@biffo/cli 0.211.2 → 0.211.3

package/dist/index.js

@@ -3389,8 +3389,9 @@ async function buildCommitAndOpenPr(options, deps, plan, migrations, fromVersion
     `Applied ${applied.written.length} change(s), ${applied.deleted.length + (cleanedCoreVersion ? 1 : 0)} deletion(s), ${carried.length} new migration(s)`
   );
   const lockfiles = await refreshInstanceLockfiles(options.cwd, applied, deps);
+  const carriedPrs = readCarriedPrs(options.templateRepo, fromVersion, toVersion);
   await git.add(options.cwd, ["-A"]);
-  await git.commit(options.cwd, `chore(core): upgrade template core ${fromVersion} -> ${toVersion}`);
+  await git.commit(options.cwd, buildCommitMessage(fromVersion, toVersion, carriedPrs));
   log.step(3, 4, `Pushing ${branch}`);
   const pushOpts = { token };
   if (options.remote) pushOpts.remote = options.remote;
@@ -3415,7 +3416,7 @@ async function buildCommitAndOpenPr(options, deps, plan, migrations, fromVersion
       lockfiles,
       breaking,
       cleanedCoreVersion ? coreVersionCleanup : null,
-      readCarriedPrs(options.templateRepo, fromVersion, toVersion)
+      carriedPrs
     )
   });
   if (plan.conflicts.length > 0) {
@@ -3443,6 +3444,11 @@ function carriedPrsSection(carriedPrs) {
   const unique = [...new Set(carriedPrs)].sort((a, b) => a - b);
   return ["", `<!-- ${CARRIED_PRS_MARKER}${unique.join(",")} -->`];
 }
+function buildCommitMessage(from, to, carriedPrs) {
+  const subject = `chore(core): upgrade template core ${from} -> ${to}`;
+  const marker = carriedPrsSection(carriedPrs);
+  return marker.length === 0 ? subject : [subject, ...marker].join("\n");
+}
 function carriedPrNumbers(subjects) {
   const numbers = [];
   for (const subject of subjects) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biffo/cli",
-  "version": "0.211.2",
+  "version": "0.211.3",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",