Skip to content

chore: fix git cleanup error code#193

Merged
martimlobao merged 1 commit intomainfrom
chore/git-cleanup
Jan 9, 2026
Merged

chore: fix git cleanup error code#193
martimlobao merged 1 commit intomainfrom
chore/git-cleanup

Conversation

@martimlobao
Copy link
Owner

@martimlobao martimlobao commented Jan 9, 2026

  • fix false positive returned error code in git cleanup custom command

Note

Improves the cleanup alias in linkme/.gitconfig for safer branch pruning and correct exit status.

  • Quoted variables and added early return if git checkout fails to prevent false non-zero exits
  • Filters merged branches safely (ignores current/target, handles empty lines) before git branch -d
  • Uses git for-each-ref with explicit --format and guards merge-base failures
  • Deletes only fully squashed branches via git cherry check, with robust parsing of branch names

Written by Cursor Bugbot for commit 40bf16b. This will update automatically on new commits. Configure here.

- fix false positive returned error code in git cleanup custom command
@sourcery-ai
Copy link
Contributor

sourcery-ai bot commented Jan 9, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Updates the custom cleanup git alias in linkme/.gitconfig to make branch pruning safer and to ensure it returns a correct non-error exit code, by hardening branching logic, quoting, and error handling.

File-Level Changes

Change Details Files
Hardened the custom git cleanup alias to avoid false non-zero exit codes and make branch pruning logic safer.
  • Ensures the alias exits early and cleanly if the initial git checkout step fails instead of continuing and returning a misleading error code.
  • Adds proper shell quoting around variables and branch names to avoid word-splitting and issues with special characters.
  • Refines the filtering of merged branches so it skips the current and target branches, ignores empty lines, and only passes validated branch names to deletion.
  • Uses git for-each-ref with an explicit --format and guards calls to git merge-base so failures don’t propagate as incorrect cleanup errors.
  • Restricts deletion to branches that are fully merged or squashed (via git cherry checks) with more robust parsing of branch names before deletion.
linkme/.gitconfig

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@martimlobao martimlobao merged commit 2f340ed into main Jan 9, 2026
16 checks passed
@martimlobao martimlobao deleted the chore/git-cleanup branch January 9, 2026 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant