opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6' into stable-2.7

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

Change-Id: Ib373c4f0004ba8ab635e1995e6af2049d5f03ca3
This commit is contained in:
David Pursehouse
2013-11-22 11:44:24 +09:00
parent b3faa893a5 b9e9b23d8b
commit 10532abdff
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -507,9 +507,9 @@ public class CommitValidators {
// If there are no SSH keys, the commit-msg hook must be installed via // If there are no SSH keys, the commit-msg hook must be installed via
// HTTP(S) // HTTP(S)
if (hostKeys.isEmpty()) { if (hostKeys.isEmpty()) {
String p = ".git/hooks/commit-msg"; String p = "$gitdir/hooks/commit-msg";
return String.format( 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); getGerritUrl(canonicalWebUrl), p);
} }
@@ -530,7 +530,7 @@ public class CommitValidators {
sshPort = 22; 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); sshPort, currentUser.getUserName(), sshHost);
} }