{"thread":{"id":"24692","subject":"[PATCH] commit: fix test broken by jn/commit-no-change-wo-status","startedAt":"2010-08-10T13:38:39Z","lastAt":"2010-08-10T23:56:12Z","messageCount":2,"participants":["Ævar Arnfjörð Bjarmason","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"147634","messageId":"1281447519-25862-1-git-send-email-avarab@gmail.com","threadId":"24692","inReplyTo":null,"subject":"[PATCH] commit: fix test broken by jn/commit-no-change-wo-status","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T13:38:39Z","receivedAt":"2010-08-10T13:38:39Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\"commit: suppress status summary when no changes staged\" in Jonathan\nNieder's jn/commit-no-change-wo-status series changed git commit\n--dry-run output. But didn't update the t/t6040-tracking-info.sh test,\nwhich relied on the old output.\n\nChange the test to check the new output, and additionally test stderr\nthere while I'm at it.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n\nThis is 1/2 things causing black smoke in pu right now.\n\n t/t6040-tracking-info.sh |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh\nindex 1785e17..5f50f70 100755\n--- a/t/t6040-tracking-info.sh\n+++ b/t/t6040-tracking-info.sh\n@@ -70,8 +70,9 @@ test_expect_success 'status' '\n \t\tgit checkout b1 >/dev/null &&\n \t\t# reports nothing to commit\n \t\ttest_must_fail git commit --dry-run\n-\t) >actual &&\n-\tgrep \"have 1 and 1 different\" actual\n+\t) >actual 2>actual-err &&\n+\tgrep \"nothing to commit\" actual &&\n+\tgrep \"Already on\" actual-err\n '\n \n test_expect_success 'status when tracking lightweight tags' '\n-- \n1.7.1\n"},{"id":"147704","messageId":"20100810235612.GC2099@burratino","threadId":"24692","inReplyTo":"1281447519-25862-1-git-send-email-avarab@gmail.com","subject":"Re: [PATCH] commit: fix test broken by jn/commit-no-change-wo-status","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-10T23:56:12Z","receivedAt":"2010-08-10T23:56:12Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ævar Arnfjörð Bjarmason wrote:\n\n> +++ b/t/t6040-tracking-info.sh\n> @@ -70,8 +70,9 @@ test_expect_success 'status' '\n>  \t\tgit checkout b1 >/dev/null &&\n>  \t\t# reports nothing to commit\n>  \t\ttest_must_fail git commit --dry-run\n> -\t) >actual &&\n> -\tgrep \"have 1 and 1 different\" actual\n> +\t) >actual 2>actual-err &&\n> +\tgrep \"nothing to commit\" actual &&\n> +\tgrep \"Already on\" actual-err\n\nHmm, this looks rather like a bug in the series: it looks\nlike as an unpleasant side-effect it eliminates the\n\n # Not currently on any branch.\n\n-like output.\n"}]}