git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Tim Henigan <tim.henigan@gmail.com>
To: gitster@pobox.com, git@vger.kernel.org, davvid@gmail.com
Cc: Tim Henigan <tim.henigan@gmail.com>
Subject: [PATCH 7/9 v6] difftool: replace system call with Git::command_noisy
Date: Thu, 22 Mar 2012 15:52:22 -0400	[thread overview]
Message-ID: <1332445944-10944-8-git-send-email-tim.henigan@gmail.com> (raw)
In-Reply-To: <1332445944-10944-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 <tim.henigan@gmail.com>
---
 git-difftool.perl |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/git-difftool.perl b/git-difftool.perl
index d4fe998..7366bf5 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -75,12 +75,4 @@ if (defined($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.10.rc1.36.g15e879

  parent reply	other threads:[~2012-03-22 19:53 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-22 19:52 [PATCH 0/9 v6] difftool: teach command to perform directory diffs Tim Henigan
2012-03-22 19:52 ` [PATCH 1/9 v6] difftool: parse options using Getopt::Long Tim Henigan
2012-03-22 19:52 ` [PATCH 2/9 v6] difftool: add '--no-gui' option Tim Henigan
2012-03-22 19:52 ` [PATCH 3/9 v6] difftool: exit(0) when usage is printed Tim Henigan
2012-03-22 19:52 ` [PATCH 4/9 v6] difftool: remove explicit change of PATH Tim Henigan
2012-03-22 19:52 ` [PATCH 5/9 v6] difftool: stop appending '.exe' to git Tim Henigan
2012-03-22 19:52 ` [PATCH 6/9 v6] difftool: eliminate setup_environment function Tim Henigan
2012-03-22 19:52 ` Tim Henigan [this message]
2012-03-22 19:52 ` [PATCH 8/9 v6] difftool: teach difftool to handle directory diffs Tim Henigan
2012-03-22 19:52 ` [PATCH 9/9 v6] difftool: print list of valid tools with '--tool-help' Tim Henigan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1332445944-10944-8-git-send-email-tim.henigan@gmail.com \
    --to=tim.henigan@gmail.com \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).