Re: [PATCH 14/14] t{3032,6038}-*.sh: Allow SED_BIN_OPT to override the -b sed option
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 14, 2010, 19:31 UTC
- Message-ID
- <7vlj3stamh.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <4D07BAE8.6070904@ramsay1.demon.co.uk>
Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:
Show 27 quoted lines
> Some older versions of sed (eg. v3.02) do not understand the -b
> (--binary) option. However, these versions of sed may have an
> equivalent option we can use to request binary mode processing
> (eg. -c or --nocr).
>
> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
> ---
>
> I nearly didn't send this patch, since my MinGW sed is somewhat old, and
> most people would not have this problem. (Note I *think* I installed
> using msysGit-fullinstall-1.6.4-preview20090729.exe)
> So, feel free to drop this patch...
>
> t/t3032-merge-recursive-options.sh | 2 +-
> t/t6038-merge-text-auto.sh | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
> index 29e049a..22d9988 100755
> --- a/t/t3032-merge-recursive-options.sh
> +++ b/t/t3032-merge-recursive-options.sh
> @@ -13,7 +13,7 @@ test_description='merge-recursive options
>
> . ./test-lib.sh
>
> -test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
> +test_have_prereq SED_STRIPS_CR && SED_OPTIONS=${SED_BIN_OPT--b}It is unclear who is supposed to feed you SED_BIN_OPT.
Perhaps a patch to add an insn like "If you have an ancient sed, export SED_BIN_OPT=-c before running tests" to t/README is also necessary to go together with this change.