diff options
| author | Brandon Casey <drafnel@gmail.com> | 2011-01-06 00:30:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-06 20:34:52 (GMT) |
| commit | bc2d159421bb017edc7b8b8d6d5544e1c83073e4 (patch) | |
| tree | ecc586299d0898dd5d3f79f40470565e5db6bd47 /t | |
| parent | ed40ec551d4517323c6a46aa555b83cc7651ddbc (diff) | |
| download | git-bc2d159421bb017edc7b8b8d6d5544e1c83073e4.zip git-bc2d159421bb017edc7b8b8d6d5544e1c83073e4.tar.gz git-bc2d159421bb017edc7b8b8d6d5544e1c83073e4.tar.bz2 | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3032-merge-recursive-options.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh index 2293797..de9ff89 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 " "$@" } && |