From: Tim Henigan <tim.henigan@gmail.com>
To: gitster@pobox.com, davvid@gmail.com, git@vger.kernel.org
Cc: Tim Henigan <tim.henigan@gmail.com>
Subject: [PATCH 5/9 v2] difftool: eliminate setup_environment function
Date: Sat, 17 Mar 2012 21:55:30 -0400 [thread overview]
Message-ID: <1332035734-5443-6-git-send-email-tim.henigan@gmail.com> (raw)
In-Reply-To: <1332035734-5443-1-git-send-email-tim.henigan@gmail.com>
Removing this function shortens the code and makes it easier to read.
Now all environment variables are set as part of procedural operation.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
---
git-difftool.perl | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index 99ff587..9495f14 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -27,12 +27,6 @@ USAGE
exit($exitcode);
}
-sub setup_environment
-{
- $ENV{GIT_PAGER} = '';
- $ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';
-}
-
# parse command-line options. all unrecognized options and arguments
# are passed through to the 'git diff' command.
my ($difftool_cmd, $extcmd, $gui, $help, $no_prompt, $prompt);
@@ -76,7 +70,8 @@ elsif (defined($no_prompt)) {
$ENV{GIT_DIFFTOOL_NO_PROMPT} = 'true';
}
-setup_environment();
+$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
--
1.7.9.1.290.gbd444
next prev parent reply other threads:[~2012-03-18 1:56 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-17 1:57 [PATCH 0/9] difftool: teach command to perform directory diffs Tim Henigan
2012-03-17 1:57 ` [PATCH 1/9] difftool: parse options using Getopt::Long Tim Henigan
2012-03-17 3:21 ` David Aguilar
2012-03-17 13:54 ` Tim Henigan
2012-03-18 3:29 ` David Aguilar
2012-03-17 1:57 ` [PATCH 2/9] difftool: exit(0) when usage is printed Tim Henigan
2012-03-17 1:57 ` [PATCH 3/9] difftool: remove explicit change of PATH Tim Henigan
2012-03-17 1:57 ` [PATCH 4/9] difftool: stop appending '.exe' to git Tim Henigan
2012-03-17 2:06 ` [PATCH 0/9] difftool: teach command to perform directory diffs Junio C Hamano
2012-03-17 2:26 ` Tim Henigan
2012-03-17 4:24 ` Junio C Hamano
2012-03-18 1:55 ` [PATCH 0/9 v2] " Tim Henigan
2012-03-18 1:55 ` [PATCH 1/9 v2] difftool: parse options using Getopt::Long Tim Henigan
2012-03-18 1:55 ` [PATCH 2/9 v2] difftool: exit(0) when usage is printed Tim Henigan
2012-03-18 1:55 ` [PATCH 3/9 v2] difftool: remove explicit change of PATH Tim Henigan
2012-03-18 1:55 ` [PATCH 4/9 v2] difftool: stop appending '.exe' to git Tim Henigan
2012-03-18 1:55 ` Tim Henigan [this message]
2012-03-18 1:55 ` [PATCH 6/9 v2] difftool: replace system call with Git::command_noisy Tim Henigan
2012-03-18 1:55 ` [PATCH 7/9 v2] difftool: teach difftool to handle directory diffs Tim Henigan
2012-03-18 1:55 ` [PATCH 8/9 v2] difftool: teach dir-diff to copy modified files back to working tree Tim Henigan
2012-03-18 1:55 ` [PATCH 9/9 v2] difftool: print list of valid tools with '--tool-help' Tim Henigan
2012-03-19 21:00 ` [PATCH 0/9 v2] difftool: teach command to perform directory diffs Junio C Hamano
2012-03-20 2:52 ` David Aguilar
2012-03-20 5:52 ` Junio C Hamano
2012-03-20 13:07 ` Tim Henigan
2012-03-20 16:36 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332035734-5443-6-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.
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 NNTP newsgroup(s).