summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2022-12-28 18:42:09 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2022-12-28 20:08:38 +0000
commit970e9acaa913704e34fe4f40ed0b20cf7088964d (patch)
tree579342f980e35ee3d92269b3e5eef8fc7ae53c19
parent7d3a474627f8d0d6803f34da4db51967fb1908f7 (diff)
tainted-objects (cleanup): Add some printdebugs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit11
1 files changed, 8 insertions, 3 deletions
diff --git a/dgit b/dgit
index 9ad9bc0..db576a7 100755
--- a/dgit
+++ b/dgit
@@ -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;
+ }
}
}