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

Re: [PATCH] t6024-recursive-merge.sh: hide spurious output when not running verbosely

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 29, 2008, 23:34 UTC
Message-ID
<alpine.LSU.1.00.0802292334040.22527@racer.site>
In-Reply-To
<1204323805-23185-1-git-send-email-mh@glandium.org>
Hi,
On Fri, 29 Feb 2008, Mike Hommey wrote:
Show 11 quoted lines
> diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
> index 149ea85..43b5f15 100755
> --- a/t/t6024-recursive-merge.sh
> +++ b/t/t6024-recursive-merge.sh
> @@ -81,7 +81,7 @@ EOF
>  
>  test_expect_success "virtual trees were processed" "git diff expect out"
>  
> -git reset --hard
> +git reset --hard >&3 2>&4
>  test_expect_success 'refuse to merge binary files' '

Would it not be _much_ more sensible to pull that command _into_ the test_expect_success?

Ciao, Dscho

Previous: Jeff KingNext: Junio C Hamano
Message 7 of 12 in “t6024-recursive-merge.sh: hide spurious output when not running verbosely”
  1. t6024-recursive-merge.sh: hide spurious output when not running verboselyMike Hommey, Feb 29, 2008
  2. Jeff KingFeb 29, 2008
  3. Mike HommeyFeb 29, 2008
  4. Jeff KingFeb 29, 2008
  5. Junio C HamanoFeb 29, 2008
  6. Jeff KingFeb 29, 2008
  7. Johannes SchindelinFeb 29, 2008
  8. Junio C HamanoFeb 29, 2008
  9. Jeff KingMar 1, 2008
  10. Shawn O. PearceMar 1, 2008
  11. Jeff KingMar 1, 2008
  12. Junio C HamanoMar 1, 2008

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.