Merge pull request microsoft#4247 from kamontat/patch-1

[@microsoft/rush-lib] Git 'pre-push' hooks didn't handle error correctly
spring6225 · Jul 24, 2023 · 25a04d1 · 25a04d1
2 parents ca870fa + 93d0bf7
commit 25a04d1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/common/changes/@microsoft/rush/fix-pre-push-hook_2023-07-20-21-26.json b/common/changes/@microsoft/rush/fix-pre-push-hook_2023-07-20-21-26.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Fix an issue where the git pre-push hook would allow push to go through if the script exited with error.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/libraries/rush-lib/src/logic/base/BaseInstallManager.ts b/libraries/rush-lib/src/logic/base/BaseInstallManager.ts
@@ -483,6 +483,7 @@ fi
             : '';
 
           const hookFileContent: string = `#!/bin/bash
+set -e
 SCRIPT_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 SCRIPT_IMPLEMENTATION_PATH="$SCRIPT_DIR/${hookRelativePath}/${filename}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -483,6 +483,7 @@ fi @@
                 : '';
               const hookFileContent: string = `#!/bin/bash
+    set -e
     SCRIPT_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
     SCRIPT_IMPLEMENTATION_PATH="$SCRIPT_DIR/${hookRelativePath}/${filename}"
@@ Expand Down @@