Merge branch 'sg/t3701-tighten-trace'

gitster · gitster · commit 4e08e3498a25 · 2018-09-24T10:30:49.000-07:00
Test update.

* sg/t3701-tighten-trace:
  t3701-add-interactive: tighten the check of trace output
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
@@ -540,7 +540,7 @@ test_expect_success 'add -p does not expand argument lists' '
 	# update it, but we want to be sure that our "." pathspec
 	# was not expanded into the argument list of any command.
 	# So look only for "not-changed".
-	! grep not-changed trace.out
+	! grep -E "^trace: (built-in|exec|run_command): .*not-changed" trace.out
 '
 
 test_expect_success 'hunk-editing handles custom comment char' '

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ test_expect_success 'add -p does not expand argument lists' '`
`540`	`540`	`# update it, but we want to be sure that our "." pathspec`
`541`	`541`	`# was not expanded into the argument list of any command.`
`542`	`542`	`# So look only for "not-changed".`
`543`		`- ! grep not-changed trace.out`
	`543`	`+ ! grep -E "^trace: (built-in\|exec\|run_command): .*not-changed" trace.out`
`544`	`544`	`'`
`545`	`545`
`546`	`546`	`test_expect_success 'hunk-editing handles custom comment char' '`