Skip to content

Commit cedeffe

Browse files
committed
Merge branch 'jk/sha1-file-reduce-useless-warnings'
* jk/sha1-file-reduce-useless-warnings: sha1_file: squelch "packfile cannot be accessed" warnings
2 parents 68a2e6a + 319b678 commit cedeffe

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

builtin/pack-objects.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -961,10 +961,8 @@ static int want_object_in_pack(const unsigned char *sha1,
961961
off_t offset = find_pack_entry_one(sha1, p);
962962
if (offset) {
963963
if (!*found_pack) {
964-
if (!is_pack_valid(p)) {
965-
warning("packfile %s cannot be accessed", p->pack_name);
964+
if (!is_pack_valid(p))
966965
continue;
967-
}
968966
*found_offset = offset;
969967
*found_pack = p;
970968
}

sha1_file.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2473,10 +2473,8 @@ static int fill_pack_entry(const unsigned char *sha1,
24732473
* answer, as it may have been deleted since the index was
24742474
* loaded!
24752475
*/
2476-
if (!is_pack_valid(p)) {
2477-
warning("packfile %s cannot be accessed", p->pack_name);
2476+
if (!is_pack_valid(p))
24782477
return 0;
2479-
}
24802478
e->offset = offset;
24812479
e->p = p;
24822480
hashcpy(e->sha1, sha1);

0 commit comments

Comments
 (0)