author | Michael J Gruber <git@drmicha.warpmail.net> | |
Tue, 14 Dec 2010 09:18:35 +0000 (10:18 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 16 Dec 2010 21:01:36 +0000 (13:01 -0800) | ||
commit | 4a689afb030c1cd5aa1c141db94bbf9dde42f05e | |
tree | e6cb1dd0c3149e47f6bc2187a51ade8057cdd35a | tree | snapshot |
parent | 51baceeec4884c14ac8c77902ec6973ab36421ca | commit | diff |
difftool: provide basename to external tools
Currently, only configured diff helpers get the basename of the file
being compared. Tools specified with "git difftool -x" only get the
names of temporary files for the different versions.
Export BASE so that an external tool can read the name from the
environment. Rather than using a third argument, this avoids breaking
existing scripts which may somewhat carelessly be using "$@" rather than
"$1" "$2".
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Currently, only configured diff helpers get the basename of the file
being compared. Tools specified with "git difftool -x" only get the
names of temporary files for the different versions.
Export BASE so that an external tool can read the name from the
environment. Rather than using a third argument, this avoids breaking
existing scripts which may somewhat carelessly be using "$@" rather than
"$1" "$2".
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-difftool.txt | diff | blob | history | |
git-difftool--helper.sh | diff | blob | history |