diff --git a/.gitattributes b/.gitattributes
index b38d7f1b43b..183fdcaaa9a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,5 @@
-*.{c,C,cc,h} whitespace=indent-with-non-tab,space-before-tab,trailing-space
+# Add indent-with-non-tab to the default git whitespace warnings.
+# Note that this file doesn't support bash-style brace expansion.
+
+*.[cCh] whitespace=indent-with-non-tab,space-before-tab,trailing-space
+*.cc whitespace=indent-with-non-tab,space-before-tab,trailing-space
diff --git a/ChangeLog b/ChangeLog
index 90413f57284..5487226c989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-17  Jason Merrill  <jason@redhat.com>
+
+	* .gitattributes: Avoid {} in filename pattern.
+
 2019-10-08  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* MAINTAINERS: Add back Trevor Smigiel; move into Write After