summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2022-12-28 13:13:28 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2022-12-28 20:08:38 +0000
commit7c08e628be1febbfd71491ab81e563fab220fb25 (patch)
treec90d6189609870445308d492eeaf2bc1c371d157 /dgit
parent3cb09a47af3a55f646d7808cd3bb78d0b907b36e (diff)
tainted-objects protocol: Reintroduce time, handle optionality
According to the poldb schema, gitobjtype is optional, so make it optional in the protocol too. Reintroduce time, as we're about to need it for calling the common message construction. Clarify what optionality means and implement it properly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index 4bb0325..c51f75e 100755
--- a/dgit
+++ b/dgit
@@ -4575,7 +4575,7 @@ sub tainted_objects_precheck ($$) {
my $objid = $row->{gitobjid};
my ($gtype, $dummy) = git_cat_file $objid, undef;
next if $gtype eq 'missing';
- if ($gtype ne $row->{gitobjtype}) {
+ if ($row->{gitobjtype} and $gtype ne $row->{gitobjtype}) {
print STDERR f_ <<'END', $objid, $gtype, $row->{gitobjtype};
warning: server says object %s type %s is tainted, but here it has type %s
END