diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:16:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:16:40 -0700 |
| commit | 6e10b9c9999cbbdfae1087a34efd701108acd806 (patch) | |
| tree | f46b99576928317408eaaa7de174b5a075dcee23 /t | |
| parent | notes: Initialize variable to appease Sun Studio (diff) | |
| parent | t7508: add a test for "git status" in a read-only repository (diff) | |
| download | tgif-6e10b9c9999cbbdfae1087a34efd701108acd806.tar.xz | |
Merge branch 'mh/status-optionally-refresh' into maint
* mh/status-optionally-refresh:
t7508: add a test for "git status" in a read-only repository
git status: refresh the index if possible
t7508: add test for "git status" refreshing the index
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7508-status.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 556d0faa77..a9df7ff7bd 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -496,6 +496,16 @@ test_expect_success 'dry-run of partial commit excluding new file in index' ' test_cmp expect output ' +cat >expect <<EOF +:100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M dir1/modified +EOF +test_expect_success 'status refreshes the index' ' + touch dir2/added && + git status && + git diff-files >output && + test_cmp expect output +' + test_expect_success 'setup status submodule summary' ' test_create_repo sm && ( cd sm && @@ -693,4 +703,19 @@ test_expect_success 'commit --dry-run submodule summary (--amend)' ' test_cmp expect output ' +test_expect_success POSIXPERM 'status succeeds in a read-only repository' ' + ( + chmod a-w .git && + # make dir1/tracked stat-dirty + >dir1/tracked1 && mv -f dir1/tracked1 dir1/tracked && + git status -s >output && + ! grep dir1/tracked output && + # make sure "status" succeeded without writing index out + git diff-files | grep dir1/tracked + ) + status=$? + chmod 775 .git + (exit $status) +' + test_done |