diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-15 02:27:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-22 12:18:00 -0700 |
| commit | 9e4b7ab652561e1807702fe5288e04b8873fc437 (patch) | |
| tree | 468f28135714375fa664bfebf4a0fa0f71582d54 /t/t7060-wtstatus.sh | |
| parent | 173e6c8852be3c543689f8613ddf3fdafd9ca7b9 (diff) | |
| download | git-9e4b7ab652561e1807702fe5288e04b8873fc437.tar.gz git-9e4b7ab652561e1807702fe5288e04b8873fc437.tar.xz | |
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/t7060-wtstatus.sh')
| -rwxr-xr-x | t/t7060-wtstatus.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 1044aa654..7b5db8066 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -50,9 +50,11 @@ test_expect_success 'M/D conflict does not segfault' ' git rm foo && git commit -m delete && test_must_fail git merge master && - test_must_fail git status > ../actual - ) && - test_cmp expect actual + test_must_fail git commit --dry-run >../actual && + test_cmp ../expect ../actual && + git status >../actual && + test_cmp ../expect ../actual + ) ' test_done |