mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint
* jk/sha1-file-reduce-useless-warnings: sha1_file: squelch "packfile cannot be accessed" warnings
This commit is contained in:
commit
3c91e9966a
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue