summaryrefslogtreecommitdiff
path: root/t/t6040-tracking-info.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-15 09:27:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-22 19:18:00 (GMT)
commit9e4b7ab652561e1807702fe5288e04b8873fc437 (patch)
tree468f28135714375fa664bfebf4a0fa0f71582d54 /t/t6040-tracking-info.sh
parent173e6c8852be3c543689f8613ddf3fdafd9ca7b9 (diff)
downloadgit-9e4b7ab652561e1807702fe5288e04b8873fc437.zip
git-9e4b7ab652561e1807702fe5288e04b8873fc437.tar.gz
git-9e4b7ab652561e1807702fe5288e04b8873fc437.tar.bz2
git status: not "commit --dry-run" anymore
This removes tentative "git stat" and make it take over "git status". There are some tests that expect "git status" to exit with non-zero status when there is something staged. Some tests expect "git status path..." to show the status for a partial commit. For these, replace "git status" with "git commit --dry-run". For the ones that do not attempt a dry-run of a partial commit that check the output from the command, check the output from "git status" as well, as they should be identical. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6040-tracking-info.sh')
-rwxr-xr-xt/t6040-tracking-info.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 00e1de9..664b0f8 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -69,7 +69,7 @@ test_expect_success 'status' '
cd test &&
git checkout b1 >/dev/null &&
# reports nothing to commit
- test_must_fail git status
+ test_must_fail git commit --dry-run
) >actual &&
grep "have 1 and 1 different" actual
'