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>
Brandon Casey committed
Jan 5, 2011 at 18:30 UTC
bc2d159421bb017edc7b8b8d6d5544e1c83073e4
1 file changed
+3
-3
t/t3032-merge-recursive-options.sh
+3
-3
@@ -16,13 +16,13 @@ test_description='merge-recursive options
16
test_expect_success 'setup' '
17
conflict_hunks () {
18
sed -n -e "
19
- /^<<<</ b inconflict
19
+ /^<<<</ b conflict
20
b
21
- : inconflict
21
+ : conflict
22
p
23
/^>>>>/ b
24
n
25
- b inconflict
25
+ b conflict
26
" "$@"
27
} &&
28