summaryrefslogtreecommitdiff
path: root/builtin/pack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-11 21:23:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-11 21:23:41 (GMT)
commitcedeffeee06f7ae5982aa5e08fad78a90c4331bf (patch)
tree25529010e1eb7d61322214af3c3ba72cba40f30c /builtin/pack-objects.c
parent68a2e6a2c80303144807c8c91a087427e3c8e727 (diff)
parent319b678a7b7c7fd03242b2b91d936f65e798cd06 (diff)
downloadgit-cedeffeee06f7ae5982aa5e08fad78a90c4331bf.zip
git-cedeffeee06f7ae5982aa5e08fad78a90c4331bf.tar.gz
git-cedeffeee06f7ae5982aa5e08fad78a90c4331bf.tar.bz2
Merge branch 'jk/sha1-file-reduce-useless-warnings'
* jk/sha1-file-reduce-useless-warnings: sha1_file: squelch "packfile cannot be accessed" warnings
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r--builtin/pack-objects.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index c3a7516..c067107 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -961,10 +961,8 @@ static int want_object_in_pack(const unsigned char *sha1,
off_t offset = find_pack_entry_one(sha1, p);
if (offset) {
if (!*found_pack) {
- if (!is_pack_valid(p)) {
- warning("packfile %s cannot be accessed", p->pack_name);
+ if (!is_pack_valid(p))
continue;
- }
*found_offset = offset;
*found_pack = p;
}