On Thu, May 7, 2009 at 8:56 AM, Brandon Casey <casey@xxxxxxxxxxxxxxx> wrote:
> diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
> index 504802c..5a1721d 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=$(perl -pe 's/ .*//' .git/MERGE_RR)
Can we have a wrapper for this please? This is correction solution.
But my work to make git work on windows without msys/cygwin also means
that I don't have perl. Maybe something like this? I know perl regex
and sed one is not completely compatible, but it should work for
simple regex used here and elsewhere.
sed_wrapper() {
if test_have_prereq PERL; then
perl -pe "$@"
else
sed -e "$@"
fi
}
--
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