Summary
test/doltlite_vtab_vc_matrix.sh:224-229 ("clean merge with untouched vtabs") merges two plain-only commits, discards the merge result, and asserts the vtab state equals BASE_STATE, which is the pre-merge state. A rolled-back or refused merge passes the assertion.
More broadly, 113 dolt_(merge|cherry_pick|revert|rebase)(…) calls in native suites send their result to /dev/null. Most then assert post-merge content that differs from the pre-merge state, which is fine; this one does not.
Fix
Capture the merge result and check it against ^[0-9a-f]{40}$ (as doltlite_cherry_pick.sh:44-46 does), and assert something the merge must have changed (e.g. plain contents or dolt_log count).
🤖 Generated with Claude Code
Summary
test/doltlite_vtab_vc_matrix.sh:224-229("clean merge with untouched vtabs") merges twoplain-only commits, discards the merge result, and asserts the vtab state equalsBASE_STATE, which is the pre-merge state. A rolled-back or refused merge passes the assertion.More broadly, 113
dolt_(merge|cherry_pick|revert|rebase)(…)calls in native suites send their result to/dev/null. Most then assert post-merge content that differs from the pre-merge state, which is fine; this one does not.Fix
Capture the merge result and check it against
^[0-9a-f]{40}$(asdoltlite_cherry_pick.sh:44-46does), and assert something the merge must have changed (e.g.plaincontents ordolt_logcount).🤖 Generated with Claude Code