| commit | ceb04564474834d6fd820a7a95fddb044f1c5352 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Tue Jul 23 19:15:23 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jul 23 19:15:24 2013 +0000 |
| tree | 494ff40d56b98bfd188997e8435c6fc8b08810a5 | |
| parent | 0a40f5bbff251cf9398d7b2bd902d000c47ed0e0 [diff] | |
| parent | b3754b5514793bb763b922c10d77975164ca61f2 [diff] |
Merge "SideBySide2: Set comment box minimum height to 16px"
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/hooks/commit-msg b/gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/hooks/commit-msg index b29e25c..12dcd52 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/hooks/commit-msg +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/hooks/commit-msg
@@ -38,6 +38,11 @@ return fi + if test "false" = "`git config --bool --get gerrit.createChangeId`" + then + return + fi + # Does Change-Id: already exist? if so, exit (no change). if grep -i '^Change-Id:' "$MSG" >/dev/null then
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java index 013f070..334f155 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java
@@ -26,7 +26,7 @@ private CommandName command; @Inject - void setPluginName(@PluginName String name, final String descr) { + void setPluginName(@PluginName String name) { this.command = Commands.named(name); }