| commit | ceb1497a74e75a0c9bd53716b787d33ad6e2397f | |
| author | David Aguilar <davvid@gmail.com> | |
| Thu, 26 Jul 2012 19:36:19 +0000 (26 12:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Jul 2012 20:06:00 +0000 (26 13:06 -0700) | ||
| tree | 479ceb0187a33c95ba67257803d09a47d0054f62 | treesnapshot (tar.gz zip) |
| parent | a4cd5be30cdd19c43908dc55d8dd39a0fe79075b | commitdiff |
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>
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>
| git-difftool.perl | diffblobblamehistory |