From: David Aguilar <davvid@gmail.com>
Date: Thu, 26 Jul 2012 19:36:19 +0000 (-0700)
Subject: difftool: Handle compare() returning -1
X-Git-Tag: v1.8.0-rc0~129^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ceb1497a74e75a0c9bd53716b787d33ad6e2397f?hp=ceb1497a74e75a0c9bd53716b787d33ad6e2397f

difftool: Handle compare() returning -1

Keep the temporary directory around when compare()
cannot read its input files, which is indicated by -1.

Defer tempdir creation to allow an early exit in setup_dir_diff().
Wrap the rest of the entry points in an exit_cleanup() function
to handle removing temporary files and error reporting.

Print the temporary files' location so that the user can
recover them.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---