Merge pull request #3112 from Faithfinder/fix/#3111

[rush] Fixes git hooks install error when rush is not at the git root
microsoft · Dec 25, 2021 · 6fd8f3e · 6fd8f3e
2 parents e357802 + 8b644b0
commit 6fd8f3e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/apps/rush-lib/src/logic/Git.ts b/apps/rush-lib/src/logic/Git.ts
@@ -172,7 +172,10 @@ export class Git {
     }
 
     if (hooksResult.result) {
-      const absoluteHooksPath: string = path.resolve(repoInfo.root, hooksResult.result);
+      const absoluteHooksPath: string = path.resolve(
+        this._rushConfiguration.rushJsonFolder,
+        hooksResult.result
+      );
       return absoluteHooksPath === defaultHooksPath;
     }
 

diff --git a/common/changes/@microsoft/rush/fix--3111_2021-12-24-15-33.json b/common/changes/@microsoft/rush/fix--3111_2021-12-24-15-33.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Fix an issue with installing Git hooks that occurs when the rush.json folder isn't at the repo's root.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}