From: Jonathan Nieder Date: Tue, 10 Aug 2010 23:56:12 GMT Subject: Re: [PATCH] commit: fix test broken by jn/commit-no-change-wo-status Message-ID: <20100810235612.GC2099@burratino> In-Reply-To: <1281447519-25862-1-git-send-email-avarab@gmail.com> Ævar Arnfjörð Bjarmason wrote: > +++ b/t/t6040-tracking-info.sh > @@ -70,8 +70,9 @@ test_expect_success 'status' ' > git checkout b1 >/dev/null && > # reports nothing to commit > test_must_fail git commit --dry-run > - ) >actual && > - grep "have 1 and 1 different" actual > + ) >actual 2>actual-err && > + grep "nothing to commit" actual && > + grep "Already on" actual-err Hmm, this looks rather like a bug in the series: it looks like as an unpleasant side-effect it eliminates the # Not currently on any branch. -like output.