X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FV2Writable.pm;h=36b84f5708ae27ff52e01d082b630bbdb1c439a9;hb=ef68ada3b207fdb511ebe6d33b072a84277e6cd6;hp=971b007b02d62e6c62ebe9ca6b536432e874e18e;hpb=88344a50f62a39dcb5673b0aa42ebec7ec44bd71;p=public-inbox.git

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 971b007b..36b84f57 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -876,6 +876,11 @@ sub update_last_commit {
 		chomp(my $n = $unit->{git}->qx(@cmd));
 		return if $n ne '' && $n == 0;
 	}
+	# don't rewind if --{since,until,before,after} are in use
+	return if (defined($last) &&
+			grep(defined, @{$sync->{-opt}}{qw(since until)}) &&
+			is_ancestor($self->git, $latest_cmt, $last));
+
 	last_epoch_commit($self, $unit->{epoch}, $latest_cmt);
 }
 
@@ -1337,7 +1342,8 @@ sub index_sync {
 	}
 
 	# reindex does not pick up new changes, so we rerun w/o it:
-	if ($opt->{reindex} && !$sync->{quit}) {
+	if ($opt->{reindex} && !$sync->{quit} &&
+			!grep(defined, @$opt{qw(since until)})) {
 		my %again = %$opt;
 		$sync = undef;
 		delete @again{qw(rethread reindex -skip_lock)};