Re: [PATCH] builtin-remote: better handling of multiple remote HEADs

From: Jeff King <peff@peff.net>
Date: Feb 15, 2009, 05:34 UTC
Message-ID: <20090215053412.GA14230@coredump.intra.peff.net>
In-Reply-To: <20090215052740.GA11522@coredump.intra.peff.net>

On Sun, Feb 15, 2009 at 12:27:40AM -0500, Jeff King wrote:

Show 9 quoted lines

> On Sat, Feb 14, 2009 at 05:30:30AM -0500, Jay Soffian wrote:
> 
> > +test_expect_success 'set-head --auto fails w/multiple HEADs' '
> > +	(cd test &&
> > +	 test_must_fail git remote set-head --auto two >& output &&
> > +	test_cmp expect output)
> 
> I missed it before, but there is a typo in this test (>&) that causes it
> to barf.

Actually, it should be "> output 2>&1" to pick up the error message we are expecting. Squashable diff is below.

The test script actually passes for me now.

---

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 49f99e9..f0be105 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -231,7 +231,7 @@ EOF
 
 test_expect_success 'set-head --auto fails w/multiple HEADs' '
 	(cd test &&
-	 test_must_fail git remote set-head --auto two >& output &&
+	 test_must_fail git remote set-head --auto two > output 2>&1 &&
 	test_cmp expect output)
 '