deploy-vir 0.2.0 → 0.2.2

package/dist/git.js

@@ -48,10 +48,9 @@ export async function pushDeploy(git, { deployName, fromBranch, toBranch }, remo
         '-1',
     ])).latest, `Failed to get current commit for ${remoteName}/${fromBranch}`);
     /** Get commits that are on {@link toBranch} but not on {@link fromBranch}. */
-    const commitsAhead = (await git.log({
-        from: `${remoteName}/${toBranch}`,
-        to: `${remoteName}/${fromBranch}`,
-    })).all;
+    const commitsAhead = (await git.log([
+        `${remoteName}/${toBranch}..${remoteName}/${fromBranch}`,
+    ])).all;
     if (!commitsAhead.length) {
         throw new KnownError('No commit diff: nothing to deploy!');
     }
@@ -71,13 +70,16 @@ export async function pushDeploy(git, { deployName, fromBranch, toBranch }, remo
     catch (error) {
         log.error(`Push failed: ${extractErrorMessage(error)}`);
         /** Get commits that are on {@link toBranch} but not on {@link fromBranch}. */
-        const commitsBehind = await git.log({
-            from: `${remoteName}/${fromBranch}`,
-            to: `${remoteName}/${toBranch}`,
-        });
-        if (commitsBehind.total > 0) {
-            log.info(`\nThe following ${commitsBehind.total} commit${commitsBehind.total === 1 ? '' : 's'} are on ${logColors.bold}${toBranch}${logColors.reset} but not on ${logColors.bold}${fromBranch}${logColors.reset}:`);
-            commitsBehind.all.forEach((commit, index) => {
+        const commitsBehind = (await git.log([
+            `${remoteName}/${fromBranch}..${remoteName}/${toBranch}`,
+        ])).all;
+        if (commitsBehind.length > 0) {
+            log.info(`\nOnn ${logColors.bold}${fromBranch}${logColors.reset}:`);
+            commitsBehind.forEach((commit, index) => {
+                log.faint(`    ${index + 1}. ${commit.hash.slice(0, 7)} (${commit.author_name}) - ${commit.message}`);
+            });
+            log.info(`\nOnn ${logColors.bold}${toBranch}${logColors.reset}:`);
+            commitsBehind.forEach((commit, index) => {
                 log.faint(`    ${index + 1}. ${commit.hash.slice(0, 7)} (${commit.author_name}) - ${commit.message}`);
             });
         }
@@ -92,7 +94,7 @@ export async function pushDeploy(git, { deployName, fromBranch, toBranch }, remo
         return {
             deployCommits: {
                 deployedCommits: commitsAhead,
-                overwrittenCommits: commitsBehind.all,
+                overwrittenCommits: commitsBehind,
             },
             branchStatus: {
                 before: beforeCommit,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "deploy-vir",
-    "version": "0.2.0",
+    "version": "0.2.2",
     "description": "Deploy a branch to another branch with notifications.",
     "keywords": [
         "deploy",

package/src/git.ts

@@ -125,10 +125,9 @@ export async function pushDeploy(
 
     /** Get commits that are on {@link toBranch} but not on {@link fromBranch}. */
     const commitsAhead = (
-        await git.log({
-            from: `${remoteName}/${toBranch}`,
-            to: `${remoteName}/${fromBranch}`,
-        })
+        await git.log([
+            `${remoteName}/${toBranch}..${remoteName}/${fromBranch}`,
+        ])
     ).all;
 
     if (!commitsAhead.length) {
@@ -152,16 +151,22 @@ export async function pushDeploy(
         log.error(`Push failed: ${extractErrorMessage(error)}`);
 
         /** Get commits that are on {@link toBranch} but not on {@link fromBranch}. */
-        const commitsBehind = await git.log({
-            from: `${remoteName}/${fromBranch}`,
-            to: `${remoteName}/${toBranch}`,
-        });
-
-        if (commitsBehind.total > 0) {
-            log.info(
-                `\nThe following ${commitsBehind.total} commit${commitsBehind.total === 1 ? '' : 's'} are on ${logColors.bold}${toBranch}${logColors.reset} but not on ${logColors.bold}${fromBranch}${logColors.reset}:`,
-            );
-            commitsBehind.all.forEach((commit, index) => {
+        const commitsBehind = (
+            await git.log([
+                `${remoteName}/${fromBranch}..${remoteName}/${toBranch}`,
+            ])
+        ).all;
+
+        if (commitsBehind.length > 0) {
+            log.info(`\nOnn ${logColors.bold}${fromBranch}${logColors.reset}:`);
+            commitsBehind.forEach((commit, index) => {
+                log.faint(
+                    `    ${index + 1}. ${commit.hash.slice(0, 7)} (${commit.author_name}) - ${commit.message}`,
+                );
+            });
+
+            log.info(`\nOnn ${logColors.bold}${toBranch}${logColors.reset}:`);
+            commitsBehind.forEach((commit, index) => {
                 log.faint(
                     `    ${index + 1}. ${commit.hash.slice(0, 7)} (${commit.author_name}) - ${commit.message}`,
                 );
@@ -184,7 +189,7 @@ export async function pushDeploy(
         return {
             deployCommits: {
                 deployedCommits: commitsAhead,
-                overwrittenCommits: commitsBehind.all,
+                overwrittenCommits: commitsBehind,
             },
             branchStatus: {
                 before: beforeCommit,