git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 11/9] t7800: add test for difftool --tool-help

From
Tim Henigan <tim.henigan@gmail.com>
Date
Mar 21, 2012, 19:35 UTC
Message-ID
<1332358560-13774-5-git-send-email-tim.henigan@gmail.com>
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
Previous: Junio C HamanoNext: Tim Henigan
Message 14 of 17 in “difftool: teach command to perform directory diffs”
  1. 0/9 difftool: teach command to perform directory diffsTim Henigan, Mar 21, 2012
  2. 7/9 difftool: teach difftool to handle directory diffsTim Henigan, Mar 21, 2012
  3. 8/9 difftool: teach dir-diff to copy modified files back to working treeTim Henigan, Mar 21, 2012
  4. 10/9 difftool: do not allow mix of '--prompt' with '--no-prompt'Tim Henigan, Mar 21, 2012
  5. Junio C HamanoMar 21, 2012
  6. 10/9 difftool: fix regression in '--prompt' optionsTim Henigan, Mar 22, 2012
  7. Junio C HamanoMar 22, 2012
  8. Thomas RastMar 22, 2012
  9. Tim HeniganMar 22, 2012
  10. Junio C HamanoMar 22, 2012
  11. Tim HeniganMar 22, 2012
  12. Junio C HamanoMar 22, 2012
  13. Junio C HamanoMar 22, 2012
  14. 11/9 t7800: add test for difftool --tool-helpTim Henigan, Mar 21, 2012
  15. 12/9 t7800: add tests for difftool --dir-diffTim Henigan, Mar 21, 2012
  16. David AguilarMar 22, 2012
  17. Tim HeniganMar 22, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.