On Thu, May 7, 2009 at 4:14 AM, Brandon Casey <casey@xxxxxxxxxxxxxxx> wrote: > Nguyen Thai Ngoc Duy wrote: >> Hi, >> >> I did "make test" on a SunOS 5.10 and it failed. > >> diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh >> index b68ab11..61ccdee 100755 >> --- a/t/t4200-rerere.sh >> +++ b/t/t4200-rerere.sh >> @@ -57,7 +57,7 @@ test_expect_success 'conflicting merge' ' >> test_must_fail git merge first >> ' >> >> -sha1=$(sed -e 's/ .*//' .git/MERGE_RR) >> +sha1=$(cut -f 1 .git/MERGE_RR) > > Are you using /bin/sed? I think it has a problem with tabs. Yes I use /bin/sed. if /usr/xpg4/bin/sed is recommended, test-lib.sh should set up PATH automatically, I think. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html