Revert "Update Gerrit commit hook"

This reverts commit 7ec738a776.

etc/gerrit/commit-msg

@@ -1,5 +1,5 @@
 #!/bin/sh
-# From Gerrit Code Review 2.8.1
+# From Gerrit Code Review 2.4.2
 #
 # Part of Gerrit Code Review (http://code.google.com/p/gerrit/)
 #
@@ -18,8 +18,6 @@
 # limitations under the License.
 #
 
-unset GREP_OPTIONS
-
 CHANGE_ID_AFTER="Bug|Issue"
 MSG="$1"
 
@@ -39,11 +37,6 @@ add_ChangeId() {
 		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
@@ -159,7 +152,7 @@ add_ChangeId() {
 		if (unprinted) {
 			print "Change-Id: I'"$id"'"
 		}
-	}' "$MSG" > "$T" && mv "$T" "$MSG" || rm -f "$T"
+	}' "$MSG" > $T && mv $T "$MSG" || rm -f $T
 }
 _gen_ChangeIdInput() {
 	echo "tree `git write-tree`"