# [PATCH] commit: fix test broken by jn/commit-no-change-wo-status 2 messages from 2010-08-10 to 2010-08-10. Participants: Ævar Arnfjörð Bjarmason, Jonathan Nieder. Thread: https://gitlist.dev/t/24692 ## Ævar Arnfjörð Bjarmason, 2010-08-10 13:38 Subject: [PATCH] commit: fix test broken by jn/commit-no-change-wo-status Message-ID: <1281447519-25862-1-git-send-email-avarab@gmail.com> URL: https://gitlist.dev/e/1281447519-25862-1-git-send-email-avarab%40gmail.com ``` "commit: suppress status summary when no changes staged" in Jonathan Nieder's jn/commit-no-change-wo-status series changed git commit --dry-run output. But didn't update the t/t6040-tracking-info.sh test, which relied on the old output. Change the test to check the new output, and additionally test stderr there while I'm at it. Signed-off-by: Ævar Arnfjörð Bjarmason --- This is 1/2 things causing black smoke in pu right now. t/t6040-tracking-info.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index 1785e17..5f50f70 100755 --- a/t/t6040-tracking-info.sh +++ 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 ' test_expect_success 'status when tracking lightweight tags' ' -- 1.7.1 ``` ## Jonathan Nieder, 2010-08-10 23:56 Subject: Re: [PATCH] commit: fix test broken by jn/commit-no-change-wo-status Message-ID: <20100810235612.GC2099@burratino> URL: https://gitlist.dev/e/20100810235612.GC2099%40burratino 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. ```