Merge "Use rev-parse to find gitdir when generating commit-msg hook hint" into stable-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
index a57f9239fa..d782cf02c4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
@@ -507,9 +507,9 @@ public class CommitValidators {
     // If there are no SSH keys, the commit-msg hook must be installed via
     // HTTP(S)
     if (hostKeys.isEmpty()) {
-      String p = ".git/hooks/commit-msg";
+      String p = "$gitdir/hooks/commit-msg";
       return String.format(
-          "  curl -o %s %s/tools/hooks/commit-msg ; chmod +x %s", p,
+          "  gitdir=$(git rev-parse --git-dir) curl -o %s %s/tools/hooks/commit-msg ; chmod +x %s", p,
           getGerritUrl(canonicalWebUrl), p);
     }
 
@@ -530,7 +530,7 @@ public class CommitValidators {
       sshPort = 22;
     }
 
-    return String.format("  scp -p -P %d %s@%s:hooks/commit-msg .git/hooks/",
+    return String.format("  gitdir=$(git rev-parse --git-dir) scp -p -P %d %s@%s:hooks/commit-msg $gitdir/hooks/",
         sshPort, currentUser.getUserName(), sshHost);
   }