From: Simon Ruderich Date: Fri, 24 Jan 2014 00:09:50 +0000 (+0100) Subject: gitconfig: Replace attribute helper scripts with inline sh. X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=ef0b7066f4123c815ca67e74218613803c48506a;p=config%2Fdotfiles.git gitconfig: Replace attribute helper scripts with inline sh. --- diff --git a/bin/pdftotext- b/bin/pdftotext- deleted file mode 100755 index a52f8de..0000000 --- a/bin/pdftotext- +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# Run `pdftotext` but read input from stdin. - -# Copyright (C) 2011-2013 Simon Ruderich -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -exec pdftotext "$@" - diff --git a/bin/sqlite3dump b/bin/sqlite3dump deleted file mode 100755 index d11a029..0000000 --- a/bin/sqlite3dump +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# Create a SQL dump of a SQLite database. -# -# This is used to provide diffs of sqlite files when using Git. - -# Copyright (C) 2010-2013 Simon Ruderich -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -exec sqlite3 "$@" .dump diff --git a/gitconfig.in b/gitconfig.in index a04b757..f976890 100644 --- a/gitconfig.in +++ b/gitconfig.in @@ -1,6 +1,6 @@ # Global Git configuration file. -# Copyright (C) 2011-2013 Simon Ruderich +# Copyright (C) 2011-2014 Simon Ruderich # # This file is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -161,14 +161,15 @@ # Allow diffing of some binary files. # -# `pdftotext-` is a wrapper around pdftotext which writes to stdout. -# `sqlite3dump` is a wrapper calling `sqlite3 database-file .dump`. +# "sh -c '..' -" is used when the programs require additional arguments. The +# last "-" is argv[0] which is passed to sh, the real arguments are passed +# after "-" by git. [diff "gzip"] textconv = gzip -d -c [diff "pdf"] - textconv = PWD/bin/pdftotext- + textconv = sh -c 'exec pdftotext "$@" -' - [diff "sqlite"] - textconv = PWD/bin/sqlite3dump + textconv = sh -c 'exec sqlite3 "$@" .dump' - [merge] tool = vimdiff