"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 <redacted>
---
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