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

Re: [PATCH 4/4] t4200: avoid passing a non-newline terminated file to sed

From
Johannes Sixt <j.sixt@viscovery.net>
Date
May 7, 2009, 07:26 UTC
Message-ID
<4A028D24.9@viscovery.net>
In-Reply-To
<IHOAO7NDkb8K9nkprnkd2ep5vFgQr-bAuDGJW-OdtSbS6WmpSHl041GRSXpP3OcDP4_PsYKsQDU@cipher.nrlssc.navy.mil>
Brandon Casey schrieb:
Show 17 quoted lines
> Some versions of sed exit non-zero if the file they are supplied is not
> newline terminated.  Solaris's /usr/xpg4/bin/sed is one such sed.  So
> rework this test to avoid doing so.
> ---
>  t/t4200-rerere.sh |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
> index b68ab11..48dbd8e 100755
> --- a/t/t4200-rerere.sh
> +++ b/t/t4200-rerere.sh
> @@ -190,7 +190,7 @@ test_expect_success 'file2 added differently in two branches' '
>  	git add file2 &&
>  	git commit -m version2 &&
>  	test_must_fail git merge fourth &&
> -	sha1=$(sed -e "s/	.*//" .git/MERGE_RR) &&
> +	sha1=$({ cat .git/MERGE_RR; echo; } | sed -e "s/	.*//") &&
Couldn't that line become
	sha1=$(cat .git/MERGE_RR) &&
	sha1=%{sha1%%	*} &&
(a literal tab before the '*')?
-- Hannes
Previous: Junio C HamanoNext: Brandon Casey
Message 26 of 31 in “shell compatibility issues with SunOS 5.10”
  1. Nguyen Thai Ngoc DuyMay 6, 2009
  2. Junio C HamanoMay 6, 2009
  3. Nguyen Thai Ngoc DuyMay 6, 2009
  4. Nguyen Thai Ngoc DuyMay 7, 2009
  5. Johannes SixtMay 6, 2009
  6. Nguyen Thai Ngoc DuyMay 6, 2009
  7. Ralf WildenhuesMay 6, 2009
  8. Johannes SchindelinMay 6, 2009
  9. Nguyen Thai Ngoc DuyMay 6, 2009
  10. Jeff KingMay 6, 2009
  11. Brandon CaseyMay 6, 2009
  12. 0/4 workaround some Solaris sed issuesBrandon Casey, May 6, 2009
  13. 1/4 t4118: add missing '&&'Brandon Casey, May 6, 2009
  14. 2/4 t4118: avoid sed invocation on file without terminating newlineBrandon Casey, May 6, 2009
  15. 3/4 t/annotate-tests.sh: avoid passing a non-newline terminated file to sedBrandon Casey, May 6, 2009
  16. 4/4 t4200: avoid passing a non-newline terminated file to sedBrandon Casey, May 6, 2009
  17. Junio C HamanoMay 6, 2009
  18. Brandon CaseyMay 6, 2009
  19. Junio C HamanoMay 6, 2009
  20. 1/2 t4200: remove two unnecessary linesBrandon Casey, May 6, 2009
  21. 2/2 t4200: convert sed expression which operates on non-text file to perlBrandon Casey, May 6, 2009
  22. Nguyen Thai Ngoc DuyMay 6, 2009
  23. Nguyen Thai Ngoc DuyMay 7, 2009
  24. Brandon CaseyMay 7, 2009
  25. Junio C HamanoMay 7, 2009
  26. Johannes SixtMay 7, 2009
  27. Brandon CaseyMay 7, 2009
  28. Nguyen Thai Ngoc DuyMay 6, 2009
  29. Brandon CaseyMay 7, 2009
  30. Junio C HamanoMay 7, 2009
  31. Brandon CaseyMay 7, 2009

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.