Re: [PATCH v2 7/8] pack-bitmap-write.c: add a missing stop_progress()
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Oct 8, 2021, 12:14 UTC
- Message-ID
- <87czofogq9.fsf@evledraar.gmail.com>
- In-Reply-To
- <YV/DV95BkT85a2xl@google.com>
On Thu, Oct 07 2021, Emily Shaffer wrote:
Show 14 quoted lines
> On Tue, Sep 21, 2021 at 01:09:28AM +0200, Ævar Arnfjörð Bjarmason wrote: >> >> Fix a bug that's been here since 7cc8f971085 (pack-objects: implement >> bitmap writing, 2013-12-21), we did not call stop_progress() if we >> reached the early exit in this function. This will matter in a >> subsequent commit where we BUG(...) out if this happens, and matters >> now e.g. because we don't have a corresponding "region_end" for the >> progress trace2 event. > > Sounds like this was the only place we were calling start_progress() > without a stop_progress(), then? Or at least the only place that is > exercised by the test suite. Wow. I'm proud of Git contributor base :) > > Reviewed-by: Emily Shaffer <emilyshaffer@google.com>
Yes! Will clarify that, there were some fixes to other bugs in the area, but this one was the last one. Might squash it actually...
Show 21 quoted lines
>>
>> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>> ---
>> pack-bitmap-write.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
>> index 88d9e696a54..6e110e41ea4 100644
>> --- a/pack-bitmap-write.c
>> +++ b/pack-bitmap-write.c
>> @@ -550,6 +550,7 @@ void bitmap_writer_select_commits(struct commit **indexed_commits,
>> if (indexed_commits_nr < 100) {
>> for (i = 0; i < indexed_commits_nr; ++i)
>> push_bitmapped_commit(indexed_commits[i]);
>> + stop_progress(&writer.progress);
>> return;
>> }
>>
>> --
>> 2.33.0.1098.gf02a64c1a2d
>>