diff options
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -4567,7 +4567,10 @@ sub tainted_objects_precheck ($$) { my %taints; ROW: foreach my $row (@{ decode_json $json }) { foreach my $override (@{ $row->{overrides} }) { - next ROW if grep { $_ eq $override } @deliberatelies; + if (grep { $_ eq $override } @deliberatelies) { + printdebug "overriding $row->{gitobjid} $override\n"; + next ROW; + } } my $objid = $row->{gitobjid}; my ($gtype, $dummy) = git_cat_file $objid, undef; @@ -4880,9 +4883,11 @@ ENDT # server will enforce the check and this machinery is just # to prevent late failures.) failedcmd @cmd unless $pq_supported =~ m/unknown/; - } elsif (!length $json) { } else { - tainted_objects_precheck $json, $dgithead; + printdebug "tainted-objects: $json\n"; + if (length $json) { + tainted_objects_precheck $json, $dgithead; + } } } |