vcs/git: disable textconv rules

[config/dotfiles.git] / vcs / gitconfig.in

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index 50d88a9191c495a5cddd5f3d645e929c3983a6e9..7b76f4197746fae1a392d1acd99f7b442cd9e2b4 100644 (file)
--- a/vcs/gitconfig.in
+++ b/vcs/gitconfig.in
@@ -44,9 +44,6 @@
 
 [core]
        editor = vim
-       # Global gitattributes file. Thanks to canton7 in #git on Freenode
-       # (2011-11-09 13:23 CET).
-       attributesfile = PWD/gitattributes
 
 [pager]
        # Use pager for the following commands.
@@ -191,16 +188,18 @@
        # addition. See t/ for some tests and examples.
        wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
 
-# Allow diffing of some binary files.
+# Rules to allow diffing of some binary files. Disabled by default to prevent
+# programs from running them on arbitrary files via a .local .gitattributes
+# file. Copy them to .git/config of the repository to enable them.
 #
 # "sh -c '..' ARGV0" is used when the programs require additional arguments
 # which are passed after ARGV0 by git.
-[diff "gzip"]
-       textconv = gzip -d -c
-[diff "pdf"]
-       textconv = sh -c 'exec pdftotext "$@" -' ARGV0
-[diff "sqlite"]
-       textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0
+#[diff "gzip"]
+#      textconv = gzip -d -c
+#[diff "pdf"]
+#      textconv = sh -c 'exec pdftotext "$@" -' ARGV0
+#[diff "sqlite"]
+#      textconv = sh -c 'exec sqlite3 "$@" .dump' ARGV0
 
 [log]
        # Display branches/tag names in log (same as log's --decorate option).