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

Re: [PATCH 04/10] t4209: use helper functions to test --grep

From
René Scharfe <l.s.r@web.de>
Date
Mar 24, 2014, 21:42 UTC
Message-ID
<5330A6E2.2040607@web.de>
In-Reply-To
<20140324211412.GB13728@sigill.intra.peff.net>
Am 24.03.2014 22:14, schrieb Jeff King:
Show 28 quoted lines
> On Mon, Mar 24, 2014 at 11:22:58AM -0700, Junio C Hamano wrote:
> 
>> René Scharfe <l.s.r@web.de> writes:
>>
>>> -test_expect_success 'log --grep -i' '
>>> -	git log -i --grep=InItial --format=%H >actual &&
>>> -	test_cmp expect_initial actual
>>> -'
>>> +test_log	expect_initial	--grep initial
>>> +test_log	expect_nomatch	--grep InItial
>>
>> This, and the next --author one, assumes that we will never break
>> "--grep=foo" without breaking "--grep foo".  That should be OK, but
>> we might want to add separate tests e.g.
>>
>> 	test_log expect_initial --grep=initial
>>
>> perhaps?  I dunno.
> 
> Yeah, I I'd prefer "--grep=" here (and in all scripts).  In general, I
> think our attitude should be that "--foo=bar" is guaranteed to work
> forever, but "--foo bar" is not. The latter only works if the argument
> is non-optional, so that leaves us room to "break" compatibility to make
> an argument optional in a future version.
> 
> Now, whether the rest of the world and its script-writers are aware of
> this fact, I don't know. So it may be too late already (but it does look
> like we mention it in gitcli(7)).

OK, then the following should be squashed into patch 2 (t4209: factor out helper function test_log()):

diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 9f3bb40..f47231a 100755
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -10,6 +10,14 @@ test_log() {
 	shift 3
 	rest=$@
 
+	case $kind in
+	--*)
+		opt=$kind=$needle
+		;;
+	*)
+		opt=$kind$needle
+		;;
+	esac
 	case $expect in
 	expect_nomatch)
 		match=nomatch
@@ -20,7 +28,7 @@ test_log() {
 	esac
 
 	test_expect_success "log $kind${rest:+ $rest} ($match)" "
-		git log $rest $kind $needle --format=%H >actual &&
+		git log $rest $opt --format=%H >actual &&
 		test_cmp $expect actual
 	"
 }
Previous: Jeff KingNext: René Scharfe
Message 12 of 21 in “pickaxe: honor -i when used with -S and --pickaxe-regex; cleanups”
  1. 00/10 pickaxe: honor -i when used with -S and --pickaxe-regex; cleanupsRené Scharfe, Mar 22, 2014
  2. 01/10 t4209: set up expectations up frontRené Scharfe, Mar 22, 2014
  3. 02/10 t4209: factor out helper function test_log()René Scharfe, Mar 22, 2014
  4. 03/10 t4209: factor out helper function test_log_icase()René Scharfe, Mar 22, 2014
  5. Junio C HamanoMar 24, 2014
  6. Jeff KingMar 24, 2014
  7. René ScharfeMar 24, 2014
  8. Junio C HamanoMar 24, 2014
  9. 04/10 t4209: use helper functions to test --grepRené Scharfe, Mar 22, 2014
  10. Junio C HamanoMar 24, 2014
  11. Jeff KingMar 24, 2014
  12. René ScharfeMar 24, 2014
  13. 05/10 t4209: use helper functions to test --authorRené Scharfe, Mar 22, 2014
  14. 06/10 pickaxe: honor -i when used with -S and --pickaxe-regexRené Scharfe, Mar 22, 2014
  15. 07/10 pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()René Scharfe, Mar 22, 2014
  16. 08/10 pickaxe: move pickaxe() after pickaxe_match()René Scharfe, Mar 22, 2014
  17. Jeff KingMar 24, 2014
  18. 09/10 pickaxe: call strlen only when necessary in diffcore_pickaxe_count()René Scharfe, Mar 22, 2014
  19. 10/10 pickaxe: simplify kwset loop in contains()René Scharfe, Mar 22, 2014
  20. Junio C HamanoMar 24, 2014
  21. Jeff KingMar 24, 2014

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.