commit 10532abdff4f771fd2847da9509512a474217e67
author David Pursehouse <david.pursehouse@sonymobile.com> Fri Nov 22 11:44:24 2013 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Fri Nov 22 11:44:42 2013 +0900
tree 9e0def1e16485227827176c620449b396bc26fda
parent b3faa893a53440ac7bcce120b650d575023ce2ae
parent b9e9b23d8b2953ec0d4da1b2b70c010af8974514

Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Use rev-parse to find gitdir when generating commit-msg hook hint

Change-Id: Ib373c4f0004ba8ab635e1995e6af2049d5f03ca3

gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java

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 a57f923..d782cf0 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 @@
     // 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 @@
       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);
   }