t3032: limit sed branch labels to 8 characters

drafnel · gitster · commit bc2d159421bb · 2011-01-06T12:34:52.000-08:00
POSIX leaves as unspecified the handling of labels greater than 8
characters.  Apparently, Sun decided to treat them as errors.  Make sed on
Solaris happy by trimming the length of labels to 8 characters.

Signed-off-by: Brandon Casey &lt;casey@nrlssc.navy.mil&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
@@ -16,13 +16,13 @@ test_description='merge-recursive options
 test_expect_success 'setup' '
 	conflict_hunks () {
 		sed -n -e "
-			/^<<<</ b inconflict
+			/^<<<</ b conflict
 			b
-			: inconflict
+			: conflict
 			p
 			/^>>>>/ b
 			n
-			b inconflict
+			b conflict
 		" "$@"
 	} &&
 

Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,13 @@ test_description='merge-recursive options`
`16`	`16`	`test_expect_success 'setup' '`
`17`	`17`	`conflict_hunks () {`
`18`	`18`	`sed -n -e "`
`19`		`- /^<<<</ b inconflict`
	`19`	`+ /^<<<</ b conflict`
`20`	`20`	`b`
`21`		`- : inconflict`
	`21`	`+ : conflict`
`22`	`22`	`p`
`23`	`23`	`/^>>>>/ b`
`24`	`24`	`n`
`25`		`- b inconflict`
	`25`	`+ b conflict`
`26`	`26`	`" "$@"`
`27`	`27`	`} &&`
`28`	`28`