opendev/gerrit
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Shawn Pearce
2013-11-22 01:59:41 +00:00
committed by Gerrit Code Review
parent 5174e35147 dd57e969b7
commit b9e9b23d8b
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
// 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);
}