git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] t0300: use write_script helper

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 4, 2012, 06:58 UTC
Message-ID
<7vd39vjda9.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20120204063018.GB21559@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 30 quoted lines
> t0300 creates some helper shell scripts, and marks them with
> "!/bin/sh". Even though the scripts are fairly simple, they
> can fail on broken shells (specifically, Solaris /bin/sh
> will persist a temporary assignment to IFS in a "read"
> command).
>
> Rather than work around the problem for Solaris /bin/sh,
> using write_script will make sure we point to a known-good
> shell that the user has given us.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> This works fine on my Linux box, but just to sanity check that I didn't
> screw anything up in the whopping 5 lines of changes, can you confirm
> this fixes the issue for you, Ben?
>
>  t/t0300-credentials.sh |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
> index 885af8f..0b46248 100755
> --- a/t/t0300-credentials.sh
> +++ b/t/t0300-credentials.sh
> @@ -14,14 +14,13 @@ test_expect_success 'setup helper scripts' '
>  	done
>  	EOF
>  
> -	cat >git-credential-useless <<-\EOF &&
> +	write_script git-credential-useless <<-\EOF &&
>  	#!/bin/sh
An innocuous facepalm I'd be glad to remove myself ;-)
Show 8 quoted lines
>  	. ./dump
>  	exit 0
>  	EOF
> -	chmod +x git-credential-useless &&
>  
> -	cat >git-credential-verbatim <<-\EOF &&
> +	write_script git-credential-verbatim <<-\EOF &&
>  	#!/bin/sh
But other than that, looks good.
Show 10 quoted lines
>  	user=$1; shift
>  	pass=$1; shift
> @@ -29,7 +28,6 @@ test_expect_success 'setup helper scripts' '
>  	test -z "$user" || echo username=$user
>  	test -z "$pass" || echo password=$pass
>  	EOF
> -	chmod +x git-credential-verbatim &&
>  
>  	PATH="$PWD:$PATH"
>  '
Previous: Jeff KingNext: Jeff King
Message 18 of 22 in “t0300-credentials: Word around a solaris /bin/sh bug”
  1. t0300-credentials: Word around a solaris /bin/sh bugBen Walton, Feb 2, 2012
  2. Frans KlaverFeb 2, 2012
  3. Ben WaltonFeb 2, 2012
  4. Jeff KingFeb 2, 2012
  5. Junio C HamanoFeb 3, 2012
  6. Jeff KingFeb 3, 2012
  7. Ben WaltonFeb 3, 2012
  8. Junio C HamanoFeb 3, 2012
  9. Jeff KingFeb 3, 2012
  10. Junio C HamanoFeb 3, 2012
  11. Jeff KingFeb 3, 2012
  12. Ben WaltonFeb 3, 2012
  13. Junio C HamanoFeb 3, 2012
  14. Jeff KingFeb 3, 2012
  15. Jeff KingFeb 4, 2012
  16. 1/2 tests: add write_script helper functionJeff King, Feb 4, 2012
  17. 2/2 t0300: use write_script helperJeff King, Feb 4, 2012
  18. Junio C HamanoFeb 4, 2012
  19. Jeff KingFeb 4, 2012
  20. Jonathan NiederFeb 2, 2012
  21. Matthieu MoyFeb 2, 2012
  22. Jonathan NiederFeb 2, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.