Martin Ågren <martin.agren@xxxxxxxxx> writes: > On `git maintenance start`, we add a few entries to the user's cron > table. We wrap our entries using two magic markers, "# BEGIN GIT > MAINTENANCE SCHEDULE" and "# END GIT MAINTENANCE SCHEDULE". At a later > `git maintenance stop`, we will go through the table and remove these > lines. Or rather, we will remove the "BEGIN" marker, the "END" marker > and everything between them. > > Alas, we have a bug in how we detect the "END" marker: we don't. As we > loop through all the lines of the crontab, if we are in the "old > region", i.e., the region we're aiming to remove, we make an early > `continue` and don't get as far as checking for the "END" marker. Thus, > once we've seen our "BEGIN", we remove everything until the end of the > file. > > Rewrite the logic for identifying these markers. There are four cases > that are mutually exclusive: The current line starts a region or it ends > it, or it's firmly within the region, or it's outside of it (and should > be printed). > > Signed-off-by: Martin Ågren <martin.agren@xxxxxxxxx> > --- > t/t7900-maintenance.sh | 7 +++++++ > builtin/gc.c | 7 +++---- > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh > index d1e0c8f830..4bbfce31e9 100755 > --- a/t/t7900-maintenance.sh > +++ b/t/t7900-maintenance.sh > @@ -446,6 +446,13 @@ test_expect_success 'start preserves existing schedule' ' > grep "Important information!" cron.txt > ' > > +test_expect_success 'stop preserves surrounding schedule' ' > + echo "Crucial information!" >>cron.txt && > + GIT_TEST_CRONTAB="test-tool crontab cron.txt" git maintenance stop && 31345d55 (maintenance: extract platform-specific scheduling, 2020-11-24) in ds/maintenance-part-4 needs to adjust this exported variable for the tests to pass in 'seen' Is it just the matter of replacing it with GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab ..." or is there more to it? Thanks
