From: Brandon Casey <drafnel@gmail.com>
Date: Thu, 6 Jan 2011 00:30:03 +0000 (-0600)
Subject: t3032: limit sed branch labels to 8 characters
X-Git-Tag: v1.7.4-rc2~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc2d159421bb017edc7b8b8d6d5544e1c83073e4;p=git.git

t3032: limit sed branch labels to 8 characters

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 <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index 229379755..de9ff89d1 100755
--- 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
 		" "$@"
 	} &&