backport: bitcoin#24226, #26116, #26243, #26443, #26517, #26714, #26738, #27058, #27151, #27220, #27461

[knst]

What was done?

Trivial backports from Bitcoin Core v25

How Has This Been Tested?

Run & unit functional tests

Breaking Changes

N/A

Checklist:

• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have added or updated relevant unit/integration/functional/e2e tests
• I have made corresponding changes to the documentation
• I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

[greptile-apps]

Greptile Overview

Greptile Summary

This PR backports 11 trivial changes from Bitcoin Core v25, consisting primarily of minor cleanups, documentation improvements, and test enhancements. The changes include removing an unused #include <utility> header from lockedpool.cpp, adding test cases for RPC error handling (setwalletflag validation, -maxuploadtarget parsing), improving RPC documentation (getblockfrompeer), simplifying GPG verification scripts, and optimizing importmulti to skip wallet unlocking for watchonly imports. The backports also update developer guidelines to recommend ToIntegral for number parsing, modernize the commit verification workflow to use git merge-tree instead of checkouts, and add clarifying comments about timeout behavior in block fetching. These changes integrate seamlessly with Dash Core's existing codebase as they primarily touch test infrastructure, documentation, and utility code rather than consensus-critical or Dash-specific features like masternodes or LLMQ.

PR Description Notes:

• Several checklist items are unchecked (comments, tests, documentation updates), but this is acceptable for trivial backports that don't introduce new features.

Important Files Changed

Filename	Score	Overview
src/support/lockedpool.cpp	5/5	Removed unused #include <utility> header dependency with no functional impact
contrib/verify-commits/README.md	5/5	Added documentation for --clean-merge option requiring git v2.38.0+
test/functional/wallet_avoidreuse.py	5/5	Added test assertion to verify setwalletflag rejects unknown wallet flags
test/functional/feature_maxuploadtarget.py	5/5	Added test case for -maxuploadtarget parsing error handling
test/functional/wallet_importmulti.py	5/5	Added test verifying watchonly imports work on encrypted wallets without unlocking
src/net_processing.cpp	5/5	Added documentation comment explaining block request timeout behavior
src/rpc/blockchain.cpp	5/5	Enhanced RPC help text for getblockfrompeer with peer behavior clarifications
contrib/verify-commits/gpg.sh	4/5	Simplified GPG verification by delegating to GPG exit codes; has minor indentation inconsistencies
src/test/miner_tests.cpp	5/5	Removed unnecessary fCheckpointsEnabled global state manipulation from tests
test/functional/feature_fee_estimation.py	5/5	Refactored to return vsize directly instead of serialized hex for efficiency
doc/bips.md	2/5	Added BIP86 documentation for Taproot feature not implemented in Dash Core
doc/developer-notes.md	4/5	Updated number parsing guidelines and lint script references; contains duplicate section
src/wallet/rpc/backup.cpp	3/5	Optimized importmulti to skip unlocking for watchonly imports; lacks type validation
contrib/verify-commits/verify-commits.py	4/5	Modernized commit verification with direct GPG parsing and non-destructive merge checks

Confidence score: 3/5

• This PR contains mostly safe changes but has several notable issues that prevent a higher score.
• Score lowered due to: (1) BIP 86 documentation in doc/bips.md references Taproot functionality that doesn't exist in Dash Core, creating misleading documentation; (2) missing type validation in src/wallet/rpc/backup.cpp where request["watchonly"].get_bool() is called without verifying the field is a boolean; (3) duplicate section in doc/developer-notes.md; (4) inconsistent indentation in contrib/verify-commits/gpg.sh; (5) the modernized verify-commits.py changes GPG validation logic significantly and may require git v2.38.0+ in CI environments.
• Pay close attention to doc/bips.md (Taproot documentation mismatch), src/wallet/rpc/backup.cpp (potential runtime exception), and contrib/verify-commits/verify-commits.py (verify git version compatibility in CI).

Additional Comments (1)

1. doc/developer-notes.md, line 1313-1327 (link)

   syntax: Lines 1313-1327 duplicate the "Release notes" section (lines1299-1312). Remove the duplicate.

Context used:

• Context from dashboard - CLAUDE.md (source)

_{14 files reviewed, 5 comments}

_{Edit Code Review Agent Settings | Greptile}

[greptile-apps]

style: Inconsistent indentation: spaces used instead of tabs (file uses tabs elsewhere)

Prompt To Fix With AI

This is a comment left during a code review.
Path: contrib/verify-commits/gpg.sh
Line: 24:24

Comment:
**style:** Inconsistent indentation: spaces used instead of tabs (file uses tabs elsewhere)

How can I resolve this? If you propose a fix, please make it concise.

[greptile-apps]

style: Inconsistent indentation: spaces used instead of tabs (file uses tabs elsewhere)

Prompt To Fix With AI

This is a comment left during a code review.
Path: contrib/verify-commits/gpg.sh
Line: 33:33

Comment:
**style:** Inconsistent indentation: spaces used instead of tabs (file uses tabs elsewhere)

How can I resolve this? If you propose a fix, please make it concise.

[greptile-apps]

logic: BIP 86 is Taproot-specific (HD derivation for P2TR outputs), but Dash Core doesn't implement Taproot. This entry may be misleading for Dash users since the referenced functionality doesn't exist in Dash. Does Dash Core actually implement BIP 86 derivation paths, or was this copied from Bitcoin without adjusting for Dash's lack of Taproot support?

Prompt To Fix With AI

This is a comment left during a code review.
Path: doc/bips.md
Line: 32:32

Comment:
**logic:** BIP 86 is Taproot-specific (HD derivation for P2TR outputs), but Dash Core doesn't implement Taproot. This entry may be misleading for Dash users since the referenced functionality doesn't exist in Dash. Does Dash Core actually implement BIP 86 derivation paths, or was this copied from Bitcoin without adjusting for Dash's lack of Taproot support?

How can I resolve this? If you propose a fix, please make it concise.

[knst]

see header of the file:

BIPs that are implemented by Bitcoin Core, some of them are relevant for Dash Core, some are just mentioned as a reference.
Versions and PRs are relevant to Bitcoin's core if not mentioned other.

[greptile-apps]

logic: The check incorrectly uses request["watchonly"].get_bool() without checking if the value exists first. If watchonly field exists but is null or not a bool, this will throw.

Suggested change

	if (!is_watchonly) EnsureWalletIsUnlocked(wallet);
	if (!is_watchonly) EnsureWalletIsUnlocked(*pwallet);

Should the logic check if the field is a bool type before calling get_bool(), or should we assume the field is always properly typed when it exists?

Prompt To Fix With AI

This is a comment left during a code review.
Path: src/wallet/rpc/backup.cpp
Line: 1596:1596

Comment:
**logic:** The check incorrectly uses `request["watchonly"].get_bool()` without checking if the value exists first. If `watchonly` field exists but is null or not a bool, this will throw.

```suggestion
        if (!is_watchonly) EnsureWalletIsUnlocked(*pwallet);
```

 Should the logic check if the field is a bool type before calling get_bool(), or should we assume the field is always properly typed when it exists?

How can I resolve this? If you propose a fix, please make it concise.

[github-actions]

✅ No Merge Conflicts Detected

This PR currently has no conflicts with other open PRs.

[coderabbitai]

Walkthrough

This pull request encompasses a diverse set of improvements and updates across Bitcoin Core components. Primary changes include: refactoring GPG verification logic in verify-commits scripts to simplify state tracking and add trusted-keys validation; updating documentation for BIP 86 and number parsing functions; adding explanatory comments to network processing code; enhancing RPC help text for getblockfrompeer; adjusting wallet unlock logic in importmulti to be conditional on watchonly status; removing an unnecessary include from lockedpool; disabling explicit checkpoint toggles in miner tests; and adding functional test coverage for unparsable command-line arguments, unknown wallet flags, and locked wallet import scenarios.

Sequence Diagram

sequenceDiagram
    participant User
    participant verify-commits.py
    participant gpg.sh
    participant Git
    participant trusted_keys

    User->>verify-commits.py: Run with commit range
    verify-commits.py->>verify-commits.py: Read trusted_keys file
    
    rect rgb(220, 240, 255)
    Note over verify-commits.py: Age Check Phase
    verify-commits.py->>verify-commits.py: Check if commit predates trusted root
    alt Commit too old
        verify-commits.py->>User: Exit with error
    end
    end
    
    rect rgb(220, 255, 220)
    Note over verify-commits.py,gpg.sh: Signature Verification Phase
    verify-commits.py->>gpg.sh: Request signature verification
    alt SHA1 allowed
        gpg.sh->>gpg.sh: Execute gpg with trust-model always
    else SHA1 not allowed
        gpg.sh->>gpg.sh: Execute gpg with --weak-digest sha1
    end
    gpg.sh->>verify-commits.py: Return status and VALIDSIG
    end
    
    rect rgb(255, 240, 220)
    Note over verify-commits.py,trusted_keys: Trusted Keys Validation
    verify-commits.py->>trusted_keys: Check signing key
    alt Key in trusted_keys
        verify-commits.py->>verify-commits.py: Continue verification
    else Key not trusted
        verify-commits.py->>User: Reject signature
    end
    end
    
    rect rgb(240, 220, 255)
    Note over verify-commits.py,Git: Tree Verification Phase (git v2.38+)
    alt Merge commit && clean-merge enabled
        verify-commits.py->>Git: Run git merge-tree --write-tree
        Git->>verify-commits.py: Return recreated tree
        verify-commits.py->>verify-commits.py: Compare with current tree
    end
    end
    
    verify-commits.py->>User: Report verification result

Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

This diff spans multiple domains with varied complexity levels. While several changes are straightforward (documentation updates, test additions, comments), others require contextual understanding:

• contrib/verify-commits/gpg.sh and verify-commits.py: Significant refactoring of cryptographic verification logic introducing trusted-keys validation, age checks, and git merge-tree integration. These changes are security-sensitive and demand careful verification of the simplified flow and new branching logic.
• src/wallet/rpc/backup.cpp: Conditional wallet unlock based on watchonly status alters control flow in transaction import, requiring verification that this change doesn't inadvertently skip necessary security steps.
• src/support/lockedpool.cpp: Removal of <utility> include while std::move is still used elsewhere in the code may have subtle implications depending on transitive includes.
• Test additions across multiple files: New test paths for edge cases (unparsable arguments, locked wallet imports, unknown flags) should be validated for correctness and integration with existing test logic.

Human review should focus particularly on the verify-commits changes and the wallet unlock conditional logic to ensure security invariants are preserved.

Pre-merge checks and finishing touches

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 30.00% which is insufficient. The required threshold is 80.00%.	You can run @coderabbitai generate docstrings to improve docstring coverage.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Title Check	✅ Passed	The pull request title "backport: bitcoin#24226, bitcoin#26116, bitcoin#26243, bitcoin#26443, bitcoin#26517, bitcoin#26714, bitcoin#26738, bitcoin#27058, bitcoin#27151, bitcoin#27220, bitcoin#27461" directly and accurately reflects the changeset. The raw summary confirms that multiple files contain changes related to backports from Bitcoin Core (verify-commits improvements, documentation updates, RPC help text updates, test modifications, and wallet functionality changes). The title clearly conveys that this is a backport effort from specific Bitcoin Core PRs and is fully related to the main objective of the pull request. While the title is lengthy due to listing multiple PR numbers, this specificity aids in understanding the scope of the backport rather than detracting from clarity.
Description Check	✅ Passed	The pull request description states "Trivial backports from Bitcoin Core v25" and indicates the changes have been tested with unit and functional tests. This description is directly related to the changeset, as the raw summary confirms the pull request contains multiple modifications across various files that are backports from Bitcoin Core, including updates to verification scripts, documentation, RPC help text, and test files. The description may be minimal in detail, but it accurately conveys the nature of the changes and satisfies the lenient criteria by being clearly related to the actual changeset content.

✨ Finishing touches

• 📝 Generate docstrings

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

Actionable comments posted: 0

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

test/functional/feature_fee_estimation.py (1)

32-32: Update the docstring to reflect the actual return value.

The docstring states "Returns (raw transaction, fee)" but the function now returns (tx.get_vsize(), fee). The documentation should be updated to accurately describe the return value.

Apply this diff to update the docstring:

-    Returns (raw transaction, fee)."""
+    Returns (transaction vsize, fee)."""

Also applies to: 64-64

🧹 Nitpick comments (5)

test/functional/feature_fee_estimation.py (1)

151-151: Consider renaming tx_bytes to tx_vsize for clarity.

The variable tx_bytes receives the virtual size (a numeric value) from small_txpuzzle_randfee, not raw bytes. The name tx_bytes is misleading and could confuse readers. Consider renaming it to tx_vsize or tx_size to better reflect its actual content.

Apply this diff to improve variable naming:

-                (tx_bytes, fee) = small_txpuzzle_randfee(
+                (tx_vsize, fee) = small_txpuzzle_randfee(
                     self.wallet,
                     self.nodes[from_index],
                     self.confutxo,
                     self.memutxo,
                     Decimal("0.005"),
                     min_fee,
                     min_fee,
                 )
-                tx_kbytes = tx_bytes / 1000.0
+                tx_kbytes = tx_vsize / 1000.0

Also applies to: 160-160

test/functional/wallet_importmulti.py (1)

711-717: Good negative-path coverage; silence the linter for test-only passphrase.

The locked-wallet failure path is correct and asserts the expected RPC_WALLET_UNLOCK_NEEDED (-13). Add a one-line noqa to avoid Ruff S106 on the hardcoded test passphrase.

-        self.nodes[1].createwallet(wallet_name='w1', blank=True, passphrase='pass')
+        self.nodes[1].createwallet(wallet_name='w1', blank=True, passphrase='pass')  # noqa: S106 - test-only passphrase

src/wallet/rpc/backup.cpp (1)

1586-1596: Conditional unlock is correct; guard against non-boolean watchonly to keep per-request error semantics.

As written, request["watchonly"].get_bool() will throw if a caller passes a non-bool (e.g., "true"), aborting the whole RPC before per-item error handling. Consider a defensive check that treats non-bool or missing values as not watchonly, so malformed entries fail per-request inside ProcessImport*.

-        // Check all requests are watchonly
-        bool is_watchonly{true};
+        // Check all requests are explicitly watchonly
+        bool is_watchonly{true};
         for (size_t i = 0; i < requests.size(); ++i) {
             const UniValue& request = requests[i];
-            if (!request.exists("watchonly") || !request["watchonly"].get_bool()) {
+            if (!request.exists("watchonly")) {
+                is_watchonly = false;
+                break;
+            }
+            const UniValue& wo = request["watchonly"];
+            if (!(wo.isBool() && wo.get_bool())) {
                 is_watchonly = false;
                 break;
             }
         }
         // Wallet does not need to be unlocked if all requests are watchonly
         if (!is_watchonly) EnsureWalletIsUnlocked(wallet);

Based on learnings

contrib/verify-commits/gpg.sh (1)

1-1: Optional: add strict mode for robustness.

Consider adding set -eu after the shebang (portable in POSIX sh) for early exit on errors/unset vars.

 #!/bin/sh
+set -eu

contrib/verify-commits/verify-commits.py (1)

182-194: merge-tree --write-tree guard and error handling LGTM; optional exception rethrow tweak.

Git version check and error message are good. Optionally prefer raise (bare) to preserve original traceback.

-            except subprocess.CalledProcessError as e:
+            except subprocess.CalledProcessError as e:
                 if e.returncode == 128:
                     print("git v2.38+ is required for this functionality.", file=sys.stderr)
                     sys.exit(1)
                 else:
-                    raise e
+                    raise

📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between b82450a and 8ba79e5.

📒 Files selected for processing (14)

• contrib/verify-commits/README.md (1 hunks)
• contrib/verify-commits/gpg.sh (2 hunks)
• contrib/verify-commits/verify-commits.py (3 hunks)
• doc/bips.md (1 hunks)
• doc/developer-notes.md (1 hunks)
• src/net_processing.cpp (1 hunks)
• src/rpc/blockchain.cpp (1 hunks)
• src/support/lockedpool.cpp (0 hunks)
• src/test/miner_tests.cpp (0 hunks)
• src/wallet/rpc/backup.cpp (1 hunks)
• test/functional/feature_fee_estimation.py (3 hunks)
• test/functional/feature_maxuploadtarget.py (1 hunks)
• test/functional/wallet_avoidreuse.py (1 hunks)
• test/functional/wallet_importmulti.py (1 hunks)

💤 Files with no reviewable changes (2)

• src/support/lockedpool.cpp
• src/test/miner_tests.cpp

🧰 Additional context used

📓 Path-based instructions (4)

doc/**

📄 CodeRabbit inference engine (CLAUDE.md)

Unless specifically prompted, avoid making changes to the doc directory (documentation)

Files:

• doc/bips.md
• doc/developer-notes.md

src/**/*.{cpp,h,cc,cxx,hpp}

📄 CodeRabbit inference engine (CLAUDE.md)

src/**/*.{cpp,h,cc,cxx,hpp}: Dash Core C++ codebase must be written in C++20 and require at least Clang 16 or GCC 11.1
Dash uses unordered_lru_cache for efficient caching with LRU eviction

Files:

• src/wallet/rpc/backup.cpp
• src/rpc/blockchain.cpp
• src/net_processing.cpp

test/functional/**/*.py

📄 CodeRabbit inference engine (CLAUDE.md)

Functional tests should be written in Python and placed in test/functional/

Files:

• test/functional/wallet_avoidreuse.py
• test/functional/wallet_importmulti.py
• test/functional/feature_maxuploadtarget.py
• test/functional/feature_fee_estimation.py

contrib/**

📄 CodeRabbit inference engine (CLAUDE.md)

Unless specifically prompted, avoid making changes to the contrib directory (contributed scripts)

Files:

• contrib/verify-commits/README.md
• contrib/verify-commits/gpg.sh
• contrib/verify-commits/verify-commits.py

🧠 Learnings (1)

📓 Common learnings

Learnt from: knst
PR: dashpay/dash#6871
File: contrib/guix/libexec/build.sh:358-360
Timestamp: 2025-10-05T20:38:28.457Z
Learning: In the Dash repository, when backporting code from Bitcoin Core, typos and minor issues in comments should be kept as-is to reduce merge conflicts in future backports, even if they remain unfixed in Bitcoin Core's master branch.

Learnt from: kwvg
PR: dashpay/dash#6543
File: src/wallet/receive.cpp:240-251
Timestamp: 2025-02-06T14:34:30.466Z
Learning: Pull request #6543 is focused on move-only changes and refactoring, specifically backporting from Bitcoin. Behavior changes should be proposed in separate PRs.

🧬 Code graph analysis (4)

src/wallet/rpc/backup.cpp (2)

src/wallet/rpc/util.cpp (2)

• EnsureWalletIsUnlocked (79-84)
• EnsureWalletIsUnlocked (79-79)

src/wallet/rpc/util.h (1)

• wallet (18-45)

test/functional/wallet_avoidreuse.py (2)

test/functional/test_framework/util.py (1)

• assert_raises_rpc_error (132-148)

src/wallet/rpc/wallet.cpp (2)

• setwalletflag (545-611)
• setwalletflag (545-545)

test/functional/wallet_importmulti.py (3)

test/functional/test_framework/test_node.py (1)

• get_wallet_rpc (363-369)

test/functional/test_framework/util.py (1)

• assert_raises_rpc_error (132-148)

src/wallet/rpc/backup.cpp (4)

• importmulti (1472-1673)
• importmulti (1472-1472)
• result (1385-1385)
• result (1678-1678)

test/functional/feature_maxuploadtarget.py (1)

test/functional/test_framework/test_node.py (1)

• assert_start_raises_init_error (606-649)

🪛 LanguageTool

doc/developer-notes.md

[grammar] ~873-~873: Use a hyphen to join words.
Context: ...sky locale issues. - Avoid using locale dependent functions if possible. You can...

(QB_NEW_EN_HYPHEN)

🪛 Ruff (0.14.1)

test/functional/wallet_importmulti.py

713-713: Possible hardcoded password assigned to argument: "passphrase"

(S106)

contrib/verify-commits/verify-commits.py

119-119: subprocess call: check for execution of untrusted input

(S603)

---

131-131: subprocess call: check for execution of untrusted input

(S603)

---

143-143: subprocess call: check for execution of untrusted input

(S603)

---

187-187: subprocess call: check for execution of untrusted input

(S603)

---

193-193: Use raise without specifying exception name

Remove exception name

(TRY201)

---

197-197: subprocess call: check for execution of untrusted input

(S603)

🔇 Additional comments (14)

doc/bips.md (1)

32-32: Formatting and content are consistent with existing BIP entries.

The BIP 86 entry follows the established pattern used throughout the file, with proper markdown formatting, version number, and Bitcoin Core PR link. The description accurately reflects descriptor wallet support via BIP 86 since v23.0.

test/functional/wallet_avoidreuse.py (1)

118-119: LGTM! Good test coverage addition.

The test correctly validates that setting an unknown wallet flag raises the expected RPC error (-8) with the appropriate message. This improves edge-case coverage and is consistent with the implementation in src/wallet/rpc/wallet.cpp.

src/net_processing.cpp (1)

1936-1938: LGTM: clarifies expected stall/timeout and BLOCKTXN drop behavior.

Accurate, non-functional, and matches current logic in BlockRequested()/RemoveBlockRequest() and stalling/timeouts. Keeping upstream wording is good for future backports.

Based on learnings

src/rpc/blockchain.cpp (1)

486-488: Help text improvements approved.

The three new sentences clarify peer behavior for the getblockfrompeer RPC:

• Explain that subsequent calls override previous peer requests
• Document stale block filtering by peers (age ≥ ~1 month)
• Clarify disconnect behavior on non-response

These additions are appropriate and improve API documentation for users.

test/functional/feature_maxuploadtarget.py (1)

174-176: LGTM! Good test coverage for invalid command-line arguments.

This test case correctly validates that the node rejects unparsable values for -maxuploadtarget with an appropriate error message. The implementation properly stops the node before attempting to restart it with invalid arguments, and the error message format is consistent with Bitcoin Core's argument parsing.

test/functional/wallet_importmulti.py (1)

721-729: LGTM: watchonly import on locked wallet succeeds.

This validates the new conditional-unlock behavior without introducing non-upstream logic. Nice addition.

contrib/verify-commits/verify-commits.py (5)

117-123: Early exit on commits outside trusted-root ancestry — confirm intended CI semantics.

Exiting with code 0 on “predates the trusted root” avoids false failures when history diverges. Confirm this is desired (e.g., for shallow or topic branches), and that CI treats it as success only when the path from the initial commit to trusted root is fully validated.

---

124-136: Tree-SHA512 gating logic LGTM.

Cleanly disabling tree checks once hitting or predating the trusted SHA512 root matches the intent.

---

197-199: Helpful diff on unclean merge — good addition.

Emitting git diff between recreated and current trees provides actionable context.

---

95-97: Trusted keys file verified and valid.

✓ File exists and contains proper primary key fingerprints (40-hex format, one per line). Code looks good.

---

139-151: Review comment is incorrect; code has parsing bug for primary key signatures.

The review claims that extracting the last VALIDSIG field correctly matches primary key fingerprints, but this is false. GnuPG VALIDSIG format includes an optional 10th field (primary-key fingerprint) only when a subkey made the signature. When a primary key signs directly, only 9 fields are present, making split(" ")[-1] extract field 9 (a numeric signature class), not the fingerprint.

The README states trusted-keys should contain "PGP fingerprints of authorized commit signers (primary, not subkeys)", meaning the code should validate primary key signatures—yet the current parsing only works for subkey signatures. This is a parsing bug that contradicts the intended design.

Likely an incorrect or invalid review comment.

doc/developer-notes.md (1)

869-875: Documentation path verified—no changes needed.

The linter path test/lint/lint-locale-dependence.py exists in the repository as documented. The changes are accurate.

contrib/verify-commits/README.md (1)

30-33: Git ≥ 2.38 requirement verified — documentation is accurate.

The verification confirms the current environment runs git 2.39.5, which satisfies the ≥ 2.38 requirement stated in lines 30-33. The documentation correctly reflects the actual dependency for merge-tree --write-tree functionality in verify-commits.py.

contrib/verify-commits/gpg.sh (1)

9-11: Simplified gpg path LGTM; confirm raw status lines remain visible to verify-commits.py.

We still redirect gpg stderr to /dev/null. Given git --raw typically surfaces [GNUPG:] status lines itself, this should be fine, but please verify the Python script still sees VALIDSIG lines.

Also applies to: 33-35

[UdjinM6]

27151: DNM, not a duplicate in our case