undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3032: limit sed branch labels to 8 characters

Browse Source 
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>
This commit is contained in:
Brandon Casey 2011-01-05 18:30:03 -06:00 committed by Junio C Hamano
parent ed40ec551d
commit bc2d159421
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t3032-merge-recursive-options.sh
View File

@ -16,13 +16,13 @@ test_description='merge-recursive options
test_expect_success 'setup' ' test_expect_success 'setup' '
conflict_hunks () { conflict_hunks () {
sed -n -e " sed -n -e "
/^<<<</ b inconflict /^<<<</ b conflict
b b
: inconflict : conflict
p p
/^>>>>/ b /^>>>>/ b
n n
b inconflict b conflict
" "$@" " "$@"
} && } &&