All of lore.kernel.org
 help / color / mirror / 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 v3 11/9] t7800: add test for difftool --tool-help
Date: Wed, 21 Mar 2012 15:35:59 -0400	[thread overview]
Message-ID: <1332358560-13774-5-git-send-email-tim.henigan@gmail.com> (raw)
In-Reply-To: <1332358560-13774-1-git-send-email-tim.henigan@gmail.com>

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
---
 t/t7800-difftool.sh |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index dc181cf..663247c 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -300,4 +300,9 @@ test_expect_success PERL 'say no to the second file' '
 	echo "$diff" | stdin_doesnot_contain br2
 '
 
+test_expect_success PERL 'difftool --tool-help' '
+	tool_help=$(git difftool --tool-help) &&
+	echo "$tool_help" | stdin_contains tool
+'
+
 test_done
-- 
1.7.10.rc1.39.g6e141f

  parent reply	other threads:[~2012-03-21 19:37 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-21 19:35 [PATCH v3 0/9] difftool: teach command to perform directory diffs Tim Henigan
2012-03-21 19:35 ` [PATCH v3 7/9] difftool: teach difftool to handle " Tim Henigan
2012-03-21 19:35 ` [PATCH v3 8/9] difftool: teach dir-diff to copy modified files back to working tree Tim Henigan
2012-03-21 19:35 ` [PATCH v3 10/9] difftool: do not allow mix of '--prompt' with '--no-prompt' Tim Henigan
2012-03-21 20:14   ` Junio C Hamano
2012-03-22  1:53   ` [PATCH 10/9 v4] difftool: fix regression in '--prompt' options Tim Henigan
2012-03-22  4:09     ` Junio C Hamano
2012-03-22  8:19       ` Thomas Rast
2012-03-22 13:51         ` Tim Henigan
2012-03-22 16:59           ` Junio C Hamano
2012-03-22 19:01             ` Tim Henigan
2012-03-22 19:13               ` Junio C Hamano
2012-03-22 16:57         ` Junio C Hamano
2012-03-21 19:35 ` Tim Henigan [this message]
2012-03-21 19:36 ` [PATCH v3 12/9] t7800: add tests for difftool --dir-diff Tim Henigan
2012-03-22  9:53   ` David Aguilar
2012-03-22 13:55     ` 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=1332358560-13774-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.