@jsenv/github-pull-request-impact 1.6.9 → 1.6.10

package/README.md

@@ -10,4 +10,4 @@ This repository publishes `@jsenv/github-pull-request-impact` on NPM. This packa
 
 - [@jsenv/performance-impact](../jsenv-performance-impact)
 - [@jsenv/file-size-impact](../jsenv-file-size-impact)
-- [@jsenv/lighthouse-score-impact](../jsenv-performance-impact)
+- [@jsenv/lighthouse-impact](../jsenv-lighthouse-impact)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/github-pull-request-impact",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "description": "Report pull request impact on something",
   "license": "MIT",
   "author": {

package/src/commentGitHubPullRequestImpact.js

@@ -33,7 +33,7 @@ export const commentGitHubPullRequestImpact = async ({
   createCommentForVersionMismatch = jsenvCreateCommentForVersionMismatch,
   createCommentForComparison = jsenvCreateCommentForComparison,
   generatedByLink = {
-    url: "https://github.com/jsenv/github-pull-request-impact",
+    url: "https://github.com/jsenv/workflow/tree/main/packages/jsenv-github-pull-request-impact",
     text: "@jsenv/github-pull-request-impact",
   },
   runLink,
@@ -305,9 +305,14 @@ const commentPrImpact = async ({
       valueIfMissing: "Your Name",
       execCommandInProjectDirectory,
     })
-    await execCommandInProjectDirectory(
-      `git merge FETCH_HEAD --allow-unrelated-histories`,
-    )
+    // could we use https://stackoverflow.com/a/6283843 ?
+    try {
+      await execCommandInProjectDirectory(
+        `git merge FETCH_HEAD --allow-unrelated-histories --no-ff --no-commit`,
+      )
+    } catch (e) {
+      throw new Error(`git merge command failed (is there a merge conflict?)`)
+    }
     await restoreGitUserEmail()
     await restoreGitUserName()
     afterMergeInfo = await collectInfo({

package/src/internal/exec.js

@@ -11,11 +11,11 @@ export const exec = (
         cwd,
         stdio: "silent",
       },
-      (error) => {
+      (error, out) => {
         if (error) {
           reject(error)
         } else {
-          resolve()
+          resolve(out)
         }
       },
     )