Merge branch 'jk/sha1-file-reduce-useless-warnings'

* jk/sha1-file-reduce-useless-warnings:
  sha1_file: squelch "packfile cannot be accessed" warnings
This commit is contained in:
Junio C Hamano
2015-05-11 14:23:40 -07:00
2 changed files with 2 additions and 6 deletions

View File

@ -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);