From: Tim Henigan Date: Sat, 17 Mar 2012 01:59:17 GMT Subject: [PATCH 6/9] difftool: replace system call with Git::command_noisy Message-ID: <1331949557-15146-1-git-send-email-tim.henigan@gmail.com> The Git.pm module includes functions intended to standardize working with Git repositories in Perl scripts. This commit teaches difftool to use Git::command_noisy rather than a system call to run the diff command. Signed-off-by: Tim Henigan --- git-difftool.perl | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index 9495f14..8498089 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -72,12 +72,4 @@ elsif (defined($no_prompt)) { $ENV{GIT_PAGER} = ''; $ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper'; -my @command = ('git', 'diff', @ARGV); - -# ActiveState Perl for Win32 does not implement POSIX semantics of -# exec* system call. It just spawns the given executable and finishes -# the starting program, exiting with code 0. -# system will at least catch the errors returned by git diff, -# allowing the caller of git difftool better handling of failures. -my $rc = system(@command); -exit($rc | ($rc >> 8)); +git_cmd_try { Git::command_noisy(('diff', @ARGV)) } 'exit code %d'; -- 1.7.9.1.290.gbd444