development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

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

Browse source 
* jk/sha1-file-reduce-useless-warnings:
  sha1_file: squelch "packfile cannot be accessed" warnings
This commit is contained in:
Junio C Hamano 2015-06-05 12:00:07 -07:00
parent 1d93ec9397 319b678a7b
commit 3c91e9966a
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builtin/pack-objects.c
View file

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

4
sha1_file.c
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);