summaryrefslogtreecommitdiff
path: root/sha1dc
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-06-06 19:01:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-07 00:25:07 (GMT)
commit5d184f468e59cd9c5b51b5c139540015c8e41b18 (patch)
treea9831859e381d65f5b6373b41113ac3556305a71 /sha1dc
parenta0103914c228cee430b37faab212d1769e8218a0 (diff)
downloadgit-5d184f468e59cd9c5b51b5c139540015c8e41b18.zip
git-5d184f468e59cd9c5b51b5c139540015c8e41b18.tar.gz
git-5d184f468e59cd9c5b51b5c139540015c8e41b18.tar.bz2
sha1dc: ignore indent-with-non-tab whitespace violations
The upstream sha1dc code indents some lines with spaces. While this doesn't match Git's coding guidelines, it's better to leave this imported code untouched than to try to make it match our style. However, we can use .gitattributes to tell "diff --check" and "git am" not to bother us about it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1dc')
-rw-r--r--sha1dc/.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/sha1dc/.gitattributes b/sha1dc/.gitattributes
new file mode 100644
index 0000000..da53f40
--- /dev/null
+++ b/sha1dc/.gitattributes
@@ -0,0 +1 @@
+* whitespace=-indent-with-non-tab