From 9fb6cc6a2d46ce2e3cc358b59a310ad631be2843 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Wed, 13 Jun 2018 10:18:12 +0200 Subject: [PATCH] vcs/git: disable textconv rules See c8e829d ("vcs/git: remove global gitattributes file", 2018-06-13). --- vcs/gitconfig.in | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in index 98702c7..7b76f41 100644 --- a/vcs/gitconfig.in +++ b/vcs/gitconfig.in @@ -188,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). -- 2.45.2