diff --git a/bin/gstack-doctor-components.sh b/bin/gstack-doctor-components.sh index 221e5c993..af0815ec9 100644 --- a/bin/gstack-doctor-components.sh +++ b/bin/gstack-doctor-components.sh @@ -306,6 +306,7 @@ gstack_result_anchor() { REVIEW_SCOPE_RANGE) printf '%s' 'review-scope-range' ;; RECEIPT_CARRY_REFUSED) printf '%s' 'receipt-carry-refused' ;; PROSE_LINT_FOUND) printf '%s' 'prose-lint-found' ;; + RECEIPT_CARRY_TREE_MISMATCH) printf '%s' 'receipt-carry-tree-mismatch' ;; RECEIPT_CARRY_PRODUCT_CHANGED) printf '%s' 'receipt-carry-product-changed' ;; DOCS_AUDIT_BLOCKED) printf '%s' 'docs-audit-blocked' ;; RECEIPT_PROSE_MISMATCH) printf '%s' 'receipt-prose-mismatch' ;; diff --git a/test/ship-receipt-carry-rewrite.test.ts b/test/ship-receipt-carry-rewrite.test.ts index 0c14f2551..41c038d1c 100644 --- a/test/ship-receipt-carry-rewrite.test.ts +++ b/test/ship-receipt-carry-rewrite.test.ts @@ -87,7 +87,7 @@ describe('carry across a rebase', () => { repo.git('checkout', '-q', '-B', 'feature', 'origin/main'); repo.git('checkout', reviewed, '--', '.'); repo.git('commit', '-qam', 'same tree, new base'); - expect(repo.git('rev-parse', 'HEAD^{tree}')).toBe(receiptIn(body).head_tree); + expect(repo.git('rev-parse', 'HEAD^{tree}')).toBe(receiptIn(body).head_tree ?? ''); const out = carry(repo, body); expect(out.status).toBe(EXIT.refused); expect(out.out).toContain('CARRY: refused (RECEIPT_CARRY_PRODUCT_CHANGED)');