tainted-objects (cleanup): Check overrides first

This can save on a git-cat-file.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 3 insertions, 3 deletions

diff --git a/dgit b/dgit
index faa4ed7..9ad9bc0 100755
--- a/dgit
+++ b/dgit
@@ -4566,6 +4566,9 @@ sub tainted_objects_precheck ($$) {
     my ($json, $dgithead) = @_;
     my %taints;
   ROW: foreach my $row (@{ decode_json $json }) {
+	foreach my $override (@{ $row->{overrides} }) {
+	    next ROW if grep { $_ eq $override } @deliberatelies;
+	}
 	my $objid = $row->{gitobjid};
 	my ($gtype, $dummy) = git_cat_file $objid, undef;
 	next if $gtype eq 'missing';
@@ -4574,9 +4577,6 @@ sub tainted_objects_precheck ($$) {
 warning: server says object %s type %s is tainted, but here it has type %s
 END
 	}
-	foreach my $override (@{ $row->{overrides} }) {
-	    next ROW if grep { $_ eq $override } @deliberatelies;
-	}
 	$taints{$objid}{Type} = $gtype;
 	push @{ $taints{$objid}{Rows} }, $row;
     }