diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-02-15 19:07:10 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-15 08:13:13 -0800 |
| commit | 543c5caa6c93bb3d42545aeef334c6a175384db8 (patch) | |
| tree | 128ccf475112ea1a0bef93cc17f348dd5f2d368d /t/t5304-prune.sh | |
| parent | d90906a90265fa1df34a7f155fe41b1393679fc4 (diff) | |
| download | git-543c5caa6c93bb3d42545aeef334c6a175384db8.tar.gz git-543c5caa6c93bb3d42545aeef334c6a175384db8.tar.xz | |
count-objects: report garbage files in pack directory too
prepare_packed_git_one() is modified to allow count-objects to hook a
report function to so we don't need to duplicate the pack searching
logic in count-objects.c. When report_pack_garbage is NULL, the
overhead is insignificant.
The garbage is reported with warning() instead of error() in packed
garbage case because it's not an error to have garbage. Loose garbage
is still reported as errors and will be converted to warnings later.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5304-prune.sh')
| -rwxr-xr-x | t/t5304-prune.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index d64532860..e4bb3a145 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -195,4 +195,30 @@ test_expect_success 'gc: prune old objects after local clone' ' ) ' +test_expect_success 'garbage report in count-objects -v' ' + : >.git/objects/pack/foo && + : >.git/objects/pack/foo.bar && + : >.git/objects/pack/foo.keep && + : >.git/objects/pack/foo.pack && + : >.git/objects/pack/fake.bar && + : >.git/objects/pack/fake.keep && + : >.git/objects/pack/fake.pack && + : >.git/objects/pack/fake.idx && + : >.git/objects/pack/fake2.keep && + : >.git/objects/pack/fake3.idx && + git count-objects -v 2>stderr && + grep "index file .git/objects/pack/fake.idx is too small" stderr && + grep "^warning:" stderr | sort >actual && + cat >expected <<\EOF && +warning: garbage found: .git/objects/pack/fake.bar +warning: garbage found: .git/objects/pack/foo +warning: garbage found: .git/objects/pack/foo.bar +warning: no corresponding .idx nor .pack: .git/objects/pack/fake2.keep +warning: no corresponding .idx: .git/objects/pack/foo.keep +warning: no corresponding .idx: .git/objects/pack/foo.pack +warning: no corresponding .pack: .git/objects/pack/fake3.idx +EOF + test_cmp expected actual +' + test_done |