diff options
| author | Teng Long <dyroneteng@gmail.com> | 2022-07-19 00:46:03 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-18 11:20:52 -0700 |
| commit | 6411cc08f33952ab196ff232f94d602908faf344 (patch) | |
| tree | 42556afe737f2d9951845567cf84778aeb8a6a44 | |
| parent | 349c26ff295f43d7c9ae6d21a285fa417c9d3039 (diff) | |
| download | git-6411cc08f33952ab196ff232f94d602908faf344.tar.xz | |
pack-bitmap.c: do not ignore error when opening a bitmap file
Calls to git_open() to open the pack bitmap file and
multi-pack bitmap file do not report any error when they
fail. These files are optional and it is not an error if
open failed due to ENOENT, but we shouldn't be ignoring
other kinds of errors.
Signed-off-by: Teng Long <dyroneteng@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | pack-bitmap.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index b6bf454c11..da3df1cfec 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -317,10 +317,13 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git, char *bitmap_name = midx_bitmap_filename(midx); int fd = git_open(bitmap_name); - free(bitmap_name); - - if (fd < 0) + if (fd < 0) { + if (errno != ENOENT) + warning_errno("cannot open '%s'", bitmap_name); + free(bitmap_name); return -1; + } + free(bitmap_name); if (fstat(fd, &st)) { close(fd); @@ -376,10 +379,14 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git bitmap_name = pack_bitmap_filename(packfile); fd = git_open(bitmap_name); - free(bitmap_name); - if (fd < 0) + if (fd < 0) { + if (errno != ENOENT) + warning_errno("cannot open '%s'", bitmap_name); + free(bitmap_name); return -1; + } + free(bitmap_name); if (fstat(fd, &st)) { close(fd); |