Skip to content

Merge bitcoin/bitcoin#27461: verify-commits: error and exit cleanly when git is too old. #1130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: backport-0.25-batch-412
Choose a base branch
from
Open

Merge bitcoin/bitcoin#27461: verify-commits: error and exit cleanly when git is too old. #1130

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3880fff
Merge bitcoin/bitcoin#27461: verify-commits: error and exit cleanly w…
achow101 Apr 14, 2023
4f6bdc7
Update contrib/verify-commits/verify-commits.py
PastaPastaPasta Nov 26, 2025
78ba269
Update contrib/verify-commits/verify-commits.py
PastaPastaPasta Nov 26, 2025
c5f91e3
Update contrib/verify-commits/verify-commits.py
PastaPastaPasta Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion contrib/verify-commits/verify-commits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,20 @@ def main():
current_tree = subprocess.check_output([GIT, 'show', '--format=%T', current_commit]).decode('utf8').splitlines()[0]
subprocess.call([GIT, 'checkout', '--force', '--quiet', parents[0]])
subprocess.call([GIT, 'merge', '--no-ff', '--quiet', '--no-gpg-sign', parents[1]], stdout=subprocess.DEVNULL)
recreated_tree = subprocess.check_output([GIT, 'show', '--format=format:%T', 'HEAD']).decode('utf8').splitlines()[0]

# This merge-tree functionality requires git >= 2.38. The
# --write-tree option was added in order to opt-in to the new
# behavior. Older versions of git will not recognize the option and
# will instead exit with code 128.
try:
recreated_tree = subprocess.check_output([GIT, "merge-tree", "--write-tree", parents[0], parents[1]]).decode('utf8').splitlines()[0]
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
Copy link

@coderabbitai coderabbitai bot Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick | 🔵 Trivial

Use bare raise to preserve traceback.

Python best practice is to use a bare raise statement without specifying the exception name to preserve the original traceback.

Apply this diff:

-                else:
-                    raise e
+                else:
+                    raise

As per static analysis hint from Ruff.

🧰 Tools
🪛 Ruff (0.14.5)

165-165: Use raise without specifying exception name

Remove exception name

(TRY201)

🤖 Prompt for AI Agents 
In contrib/verify-commits/verify-commits.py around line 165, the code re-raises
an exception using "raise e" which discards the original traceback; change it to
a bare "raise" so the original traceback is preserved when propagating the
exception.


if current_tree != recreated_tree:
print("Merge commit {} is not clean".format(current_commit), file=sys.stderr)
subprocess.call([GIT, 'diff', current_commit])
Expand Down
Loading