diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:07 -0700 |
| commit | 3c91e9966aae9ad73a27f7066551b2861d8c8849 (patch) | |
| tree | 82710472d9b3cbb165ce0d19b9df3af078c92e56 | |
| parent | 1d93ec93970d73e57c37dffd2108dbd01761cb2c (diff) | |
| parent | 319b678a7b7c7fd03242b2b91d936f65e798cd06 (diff) | |
| download | git-3c91e9966aae9ad73a27f7066551b2861d8c8849.tar.gz | |
Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint
* jk/sha1-file-reduce-useless-warnings:
sha1_file: squelch "packfile cannot be accessed" warnings
| -rw-r--r-- | builtin/pack-objects.c | 4 | ||||
| -rw-r--r-- | sha1_file.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c3a75166bd..c067107a6a 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; } diff --git a/sha1_file.c b/sha1_file.c index 47f56f2e89..001537c935 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2473,10 +2473,8 @@ static int fill_pack_entry(const unsigned char *sha1, * answer, as it may have been deleted since the index was * loaded! */ - if (!is_pack_valid(p)) { - warning("packfile %s cannot be accessed", p->pack_name); + if (!is_pack_valid(p)) return 0; - } e->offset = offset; e->p = p; hashcpy(e->sha1, sha1); |