t4051: add test for comments preceding function lines

rscharfe · gitster · commit eced93bcb864 · 2017-11-21T09:36:06.000+09:00
When showing function context it would be helpful to show comments
immediately before declarations, as they are most likely relevant.

Add a test for that, but without specifying the choice of lines too
rigidly in the test---we may want to stop before and not include
"/*" in the future, for example.

Signed-off-by: Rene Scharfe &lt;l.s.r@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
@@ -85,6 +85,10 @@ test_expect_success 'setup' '
 
 check_diff changed_hello 'changed function'
 
+test_expect_failure ' context includes comment' '
+	grep "^ .*Hello comment" changed_hello.diff
+'
+
 test_expect_success ' context includes begin' '
 	grep "^ .*Begin of hello" changed_hello.diff
 '
diff --git a/t/t4051/hello.c b/t/t4051/hello.c
@@ -1,4 +1,7 @@
 
+/*
+ * Hello comment.
+ */
 static void hello(void)	// Begin of hello
 {
 	/*

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,10 @@ test_expect_success 'setup' '`
`85`	`85`
`86`	`86`	`check_diff changed_hello 'changed function'`
`87`	`87`
	`88`	`+test_expect_failure ' context includes comment' '`
	`89`	`+ grep "^ .*Hello comment" changed_hello.diff`
	`90`	`+'`
	`91`	`+`
`88`	`92`	`test_expect_success ' context includes begin' '`
`89`	`93`	`grep "^ .*Begin of hello" changed_hello.diff`
`90`	`94`	`'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`
	`2`	`+/*`
	`3`	`+ * Hello comment.`
	`4`	`+ */`
`2`	`5`	`static void hello(void) // Begin of hello`
`3`	`6`	`{`
`4`	`7`	`/*`