feat: rejoin splits

src/helpers/git.ts

@@ -23,9 +23,17 @@ async function tagExists(tag: string, directory: string): Promise<boolean> {
 }
 
 async function publishSubSplit(binary: string, target: string, branch: string, name: string, directory: string): Promise<void> {
-    let hash = await getExecOutput(binary, [`--prefix=${directory}`, `--origin=origin/${branch}`]);
-
-    await exec('git', ['push', target, `${hash.trim()}:refs/heads/${branch}`, '-f']);
+    const hash = (await getExecOutput(binary, [`--prefix=${directory}`, `--origin=origin/${branch}`])).trim();
+    const isAncestor = await exec('git', ['merge-base', '--is-ancestor', hash, 'HEAD'], {ignoreReturnCode: true});
+    if (isAncestor !== 0) {
+        const tree_hash = (await getExecOutput('git', ['write-tree'])).trim();
+        const message = `Split '${target}' into commit '${hash}'`;
+        // Note: if we do more than one split, we can merge all of these join commits into a single one
+        const merged_hash = await getExecOutput('git', ['commit-tree', '-p', 'HEAD', '-p', hash.trim(), '-m', message, tree_hash]);
+        await exec('git', ['reset', '--hard', merged_hash]);
+        await exec('git', ['push']);
+    }
+    await exec('git', ['push', target, `${hash}:refs/heads/${branch}`, '-f']);
 }
 
 async function commitHashHasTag(hash: string, clonePath: string) {

src/index.ts

@@ -98,9 +98,12 @@ async function promiseAllInBatches(subtreeSplits: subtreeSplit[], batchSize: num
         }
 
         // On push sync commits
-        await promiseAllInBatches(subtreeSplits, batchSize, async (split: subtreeSplit) => {
+        for (let split of subtreeSplits) {
             await publishSubSplit(splitshPath, split.name, branch, split.name, split.directory);
-        });
+        }
+        // await promiseAllInBatches(subtreeSplits, batchSize, async (split: subtreeSplit) => {
+        //     await publishSubSplit(splitshPath, split.name, branch, split.name, split.directory);
+        // });
     } else if (context.eventName === 'create') {
         // Tag created
         let event = context.payload as CreateEvent;