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 2/9 v6] difftool: add '--no-gui' option
Date: Thu, 22 Mar 2012 15:52:17 -0400 [thread overview]
Message-ID: <1332445944-10944-3-git-send-email-tim.henigan@gmail.com> (raw)
In-Reply-To: <1332445944-10944-1-git-send-email-tim.henigan@gmail.com>
This commit teaches difftool to handle the '--no-gui' option. This option
negates the existing '--gui' option. The last setting given on the command
line wins.
This allows a user to configure "[alias] mdt = difftool --gui", but still
have the ability to override the setting without error:
$ git mdt --no-gui
Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
---
Changes in v6:
- This was patch 13/9 in the previous version of the series. It has
simply been moved to 2/9.
git-difftool.perl | 7 ++++---
t/t7800-difftool.sh | 13 +++++++++++++
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index f4e28a6..bf51b79 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -22,7 +22,8 @@ sub usage
{
print << 'USAGE';
usage: git difftool [-t|--tool=<tool>]
- [-x|--extcmd=<cmd>] [-g|--gui]
+ [-x|--extcmd=<cmd>]
+ [-g|--gui] [--no-gui]
[--prompt] [-y|--no-prompt]
['git diff' options]
USAGE
@@ -49,7 +50,7 @@ sub exe
# parse command-line options. all unrecognized options and arguments
# are passed through to the 'git diff' command.
my ($difftool_cmd, $extcmd, $gui, $help, $prompt);
-GetOptions('g|gui' => \$gui,
+GetOptions('g|gui!' => \$gui,
'h' => \$help,
'prompt!' => \$prompt,
'y' => sub { $prompt = 0; },
@@ -75,7 +76,7 @@ if (defined($extcmd)) {
usage();
}
}
-if (defined($gui)) {
+if ($gui) {
my $guitool = "";
$guitool = Git::config('diff.guitool');
if (length($guitool) > 0) {
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 4fb4c93..e716d06 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -94,6 +94,19 @@ test_expect_success PERL 'difftool honors --gui' '
restore_test_defaults
'
+test_expect_success PERL 'difftool --gui last setting wins' '
+ git config diff.guitool bogus-tool &&
+ git difftool --no-prompt --gui --no-gui &&
+
+ git config merge.tool bogus-tool &&
+ git config diff.tool bogus-tool &&
+ git config diff.guitool test-tool &&
+ diff=$(git difftool --no-prompt --no-gui --gui branch) &&
+ test "$diff" = "branch" &&
+
+ restore_test_defaults
+'
+
test_expect_success PERL 'difftool --gui works without configured diff.guitool' '
git config diff.tool test-tool &&
--
1.7.10.rc1.36.g15e879
next prev 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 ` Tim Henigan [this message]
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 ` [PATCH 7/9 v6] difftool: replace system call with Git::command_noisy Tim Henigan
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332445944-10944-3-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).