[PATCH 3/3] t3032: limit sed branch labels to 8 characters
- From
Brandon Casey <casey@nrlssc.navy.mil>
- Date
- Jan 6, 2011, 00:30 UTC
- Message-ID
- <gmeXEearzUOUEst4-B2b8mMW8OqKObIqeN20uJhfiKbKa9JUYsiz4cHx7ViGaJpP8z4W9bjGjNI@cipher.nrlssc.navy.mil>
- In-Reply-To
- <gmeXEearzUOUEst4-B2b8sVUo0XhywYUDm7rCJikom1xi9tIroh9GnJRv-bJTzbCbvqI-4DOU3A@cipher.nrlssc.navy.mil>
From: Brandon Casey <drafnel@gmail.com>
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> --- 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 " "$@" } &&
-- 1.7.3.1