提交 3c91e996 编写于 作者: J Junio C Hamano

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

* jk/sha1-file-reduce-useless-warnings:
  sha1_file: squelch "packfile cannot be accessed" warnings
...@@ -961,10 +961,8 @@ static int want_object_in_pack(const unsigned char *sha1, ...@@ -961,10 +961,8 @@ static int want_object_in_pack(const unsigned char *sha1,
off_t offset = find_pack_entry_one(sha1, p); off_t offset = find_pack_entry_one(sha1, p);
if (offset) { if (offset) {
if (!*found_pack) { if (!*found_pack) {
if (!is_pack_valid(p)) { if (!is_pack_valid(p))
warning("packfile %s cannot be accessed", p->pack_name);
continue; continue;
}
*found_offset = offset; *found_offset = offset;
*found_pack = p; *found_pack = p;
} }
......
...@@ -2473,10 +2473,8 @@ static int fill_pack_entry(const unsigned char *sha1, ...@@ -2473,10 +2473,8 @@ static int fill_pack_entry(const unsigned char *sha1,
* answer, as it may have been deleted since the index was * answer, as it may have been deleted since the index was
* loaded! * loaded!
*/ */
if (!is_pack_valid(p)) { if (!is_pack_valid(p))
warning("packfile %s cannot be accessed", p->pack_name);
return 0; return 0;
}
e->offset = offset; e->offset = offset;
e->p = p; e->p = p;
hashcpy(e->sha1, sha1); hashcpy(e->sha1, sha1);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册