Skip to content

Word the behind branch finding accurately for deletions #435

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptr727 merged 2 commits into from
Jul 25, 2026
Merged

Word the behind branch finding accurately for deletions #435

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f78bb0e
Word the behind finding for deletions too
ptr727 Jul 25, 2026
d9c44d6
Restore "path" and align the fallback wording
ptr727 Jul 25, 2026
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
4 changes: 2 additions & 2 deletions spec/audit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ def audit_repo(entry, spec):
"main": gh(f"repos/{slug}/git/trees/{branch_main['commit']['commit']['tree']['sha']}?recursive=1"),
}
if not all(isinstance(t, dict) for t in trees.values()) or any(t.get("truncated") for t in trees.values()):
findings.append(("DRIFT", f"branch: {len(cmp['files'])}+ main-side path change(s) develop lacks (forward-sync needed; tree unavailable or too large to filter cherry-pick noise)"))
findings.append(("DRIFT", f"branch: {len(cmp['files'])}+ main-side path change(s) develop is behind on (forward-sync needed; tree unavailable or too large to filter cherry-pick noise)"))
else:
objs = {name: {e["path"]: e["sha"] for e in t["tree"] if e["type"] in ("blob", "commit")} for name, t in trees.items()}
# Split main-side drift by direction, never flagging every difference as a develop deficit.
Expand All @@ -529,7 +529,7 @@ def audit_repo(entry, spec):
behind, diverged = classify_branch_drift(objs["base"], objs["main"], objs["develop"])
if behind:
shown = ", ".join(behind[:8]) + (" ..." if len(behind) > 8 else "")
findings.append(("DRIFT", f"branch: {len(behind)} main-side path change(s) develop lacks (forward-sync needed): {shown}"))
findings.append(("DRIFT", f"branch: {len(behind)} main-side path change(s) develop is behind on (forward-sync needed): {shown}"))
if diverged:
shown = ", ".join(diverged[:8]) + (" ..." if len(diverged) > 8 else "")
findings.append(("DRIFT", f"branch: {len(diverged)} path(s) changed on both main and develop since the merge-base - reconcile before promoting (develop may already supersede main): {shown}"))
Expand Down