Merge "commit-msg: Do not add Change-Id to temp commits" into stable-2.12

gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/hooks/commit-msg

@@ -38,6 +38,12 @@ add_ChangeId() {
 		return
 	fi
 
+	# Do not add Change-Id to temp commits
+	if echo "$clean_message" | head -1 | grep -q '^\(fixup\|squash\)!'
+	then
+		return
+	fi
+
 	if test "false" = "`git config --bool --get gerrit.createChangeId`"
 	then
 		return