From 1f11fe42875dfa9c27e138130ea2e65702c8d584 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 15 Nov 2020 23:27:23 +0000 Subject: v2writable: avoid initiating leftover unindex if interrupted We can also avoid a needless progress message on log2stack interruptions, too. --- lib/PublicInbox/V2Writable.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/PublicInbox/V2Writable.pm') diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 5bac04a4..ba7cef13 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -1085,13 +1085,14 @@ sub sync_prepare ($$) { # messages to show up in mirrors, too. $sync->{D} //= $sync->{reindex} ? {} : undef; # OID_BIN => NR my $stk = log2stack($sync, $git, $range); + return 0 if $sync->{quit}; my $nr = $stk ? $stk->num_records : 0; $pr->("$nr\n") if $pr; $unit->{stack} = $stk; # may be undef unshift @{$sync->{todo}}, $unit; $regen_max += $nr; - last if $sync->{quit}; } + return 0 if $sync->{quit}; # XXX this should not happen unless somebody bypasses checks in # our code and blindly injects "d" file history into git repos -- cgit v1.2.3-24-ge0c7