gitconfig: improve rbm alias base detection

[PeterDaveHello]

User description

Let rbm resolve master/main from local refs first, then fall back to the remote default branch chosen via origin/HEAD (including remote-only refs). Forward all user-supplied arguments to git rebase so the alias mirrors the native command’s behavior.

GitHub Copilot Summary:

This pull request updates the rbm git alias in the gitconfig file to make it more robust and flexible when rebasing onto the main development branch. The new alias now better detects whether the main branch is named master or main, and also supports rebasing onto the corresponding remote branch if the local branch doesn't exist.

Improvements to git alias functionality:

• Updated the rbm alias to dynamically detect the default branch (master or main) both locally and on the remote, and to fall back to the appropriate remote branch if needed. This makes the alias more reliable in repositories that use different naming conventions for the main branch.

---

PR Type

Enhancement

---

Description

• Improved rbm alias to detect default branch from origin/HEAD first

• Falls back to local master/main branches if remote default unavailable

• Supports remote-only branches when local equivalents don't exist

• Forwards all user arguments to git rebase command

---

Diagram Walkthrough

flowchart LR
  A["origin/HEAD<br/>symbolic ref"] -->|Extract remote branch| B["Check if master/main"]
  B -->|Found locally| C["Use local branch"]
  B -->|Not found locally| D["Use remote branch"]
  D -->|Still not found| E["Fallback to<br/>master/main"]
  E -->|Not found| F["Error"]
  C --> G["git rebase<br/>with all args"]
  D --> G

File Walkthrough

Relevant files

Enhancement

gitconfig Improve rbm alias branch detection logic                                  gitconfig Enhanced rbm alias to resolve default branch from origin/HEAD symbolic reference first Added fallback logic to check local master/main branches if remote default unavailable Implemented support for remote-only branches when local equivalents don't exist Changed argument passing from single positional argument to all user-supplied arguments via "$@" +1/-1

---

Summary by CodeRabbit

• Chores
  • Enhanced the rbm Git alias for improved base branch detection. Now intelligently derives the base branch from remote origin HEAD with fallback logic to master or main branches, providing more robust handling of edge cases and remote branch naming.

[coderabbitai[bot]]

📝 Walkthrough

Walkthrough

The rbm git alias has been enhanced to implement a more sophisticated base branch detection strategy. Instead of only checking for local master or main branches, the new implementation first consults the remote origin HEAD reference, then falls back through multiple detection layers before erroring, and now preserves all rebase arguments rather than a single positional parameter.

Changes

Cohort / File(s)	Summary
Git alias enhancement gitconfig	Updated rbm alias to detect base branch from remote origin HEAD with multi-layered fallback logic (remote/main → remote/master → local/main → local/master → remote branch) and preserve all rebase arguments

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~45 minutes

• Shell script logic complexity: Multiple nested conditionals with branch detection across both local and remote references require careful tracing to verify correctness
• Edge case handling: The fallback chain through remote HEAD, master/main detection, and remote branch checking introduces several conditional paths that should be mentally tested against different repository states
• Variable substitution and quoting: Shell variable expansion with ${remote_head#origin/} pattern and proper quoting of variables in conditions and git commands need verification for robustness
• Argument preservation: Verify that the shift from a single $1 parameter to $@ preserves all rebase arguments correctly across different invocation patterns

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately and concisely describes the main change: improving the detection logic of the rbm (rebase on main branch) alias to handle base branch resolution more robustly.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✨ Finishing touches

🧪 Generate unit tests (beta)

• [ ] Create PR with unit tests
• [ ] Post copyable unit tests in a comment
• [ ] Commit unit tests in branch gitconfig-improve-rbm-alias

---

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.}

[gemini-code-assist[bot]]

Summary of Changes

Hello @PeterDaveHello, I'm Gemini Code Assist[^1]! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refines the rbm Git alias within the gitconfig file to provide a more resilient and flexible rebase experience. The core improvement lies in its enhanced ability to dynamically identify the correct base branch for rebasing, accommodating various naming conventions (e.g., master vs. main) and ensuring functionality whether the target branch is local or remote. Additionally, it ensures that all arguments passed to the alias are properly relayed to the git rebase command, increasing its utility and mirroring native Git behavior.

Highlights

• Enhanced rbm alias logic: The rbm alias now features a more robust mechanism for detecting the base branch for rebasing. It prioritizes local master or main branches, then intelligently falls back to the remote's default branch (derived from origin/HEAD), and finally checks for remote master or main if local branches are not found.
• Improved argument forwarding: The rbm alias has been updated to correctly forward all user-supplied arguments to the underlying git rebase command, ensuring it behaves more consistently with native Git commands.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with :thumbsup: and :thumbsdown: on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

[^1]: Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

[qodo-free-for-open-source-projects[bot]]

PR Compliance Guide 🔍

Below is a summary of compliance checks for this PR:

Security Compliance
⚪	Command injection risk Description: The shell command uses unquoted variable expansions in test conditions and command substitutions, which could lead to command injection if branch names contain special characters or malicious input. gitconfig [34-34] Referred Code rbm = "!fn(){ base=''; remote_head=$(git symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null || true); remote_branch=${remote_head#origin/}; if [ -n \"$remote_branch\" ] && [ \"$remote_branch\" != \"$remote_head\" ]; then case \"$remote_branch\" in master|main) if git show-ref --verify --quiet \"refs/heads/$remote_branch\"; then base=$remote_branch; elif git show-ref --verify --quiet \"refs/remotes/origin/$remote_branch\"; then base=origin/$remote_branch; fi;; esac; fi; if [ -z \"$base\" ] && git show-ref --verify --quiet refs/heads/master; then base=master; elif [ -z \"$base\" ] && git show-ref --verify --quiet refs/heads/main; then base=main; fi; if [ -z \"$base\" ] && [ -n \"$remote_branch\" ]; then if git show-ref --verify --quiet \"refs/heads/$remote_branch\"; then base=$remote_branch; elif [ -n \"$remote_head\" ] && git show-ref --verify --quiet \"refs/remotes/$remote_head\"; then base=$remote_head; fi; fi; if [ -z \"$base\" ]; then echo 'Both master and main branch not found!' >&2; return 1; fi; git rebase \"$base\" \"$@\"; };fn" rmt = remote
Ticket Compliance
⚪	🎫 No ticket provided [ ] Create ticket/issue <!-- /create_ticket --create_ticket=true -->
Codebase Duplication Compliance
⚪	Codebase context is not defined Follow the guide to enable codebase context checks.
Custom Compliance
🟢	Generic: Comprehensive Audit Trails Objective: To create a detailed and reliable record of critical system actions for security analysis and compliance. Status: Passed
	Generic: Meaningful Naming and Self-Documenting Code Objective: Ensure all identifiers clearly express their purpose and intent, making code self-documenting Status: Passed
	Generic: Robust Error Handling and Edge Case Management Objective: Ensure comprehensive error handling that provides meaningful context and graceful degradation Status: Passed
	Generic: Secure Error Handling Objective: To prevent the leakage of sensitive system information through error messages while providing sufficient detail for internal debugging. Status: Passed
	Generic: Secure Logging Practices Objective: To ensure logs are useful for debugging and auditing without exposing sensitive information like PII, PHI, or cardholder data. Status: Passed
	Generic: Security-First Input Validation and Data Handling Objective: Ensure all data inputs are validated, sanitized, and handled securely to prevent vulnerabilities Status: Passed

Compliance status legend

🟢 - Fully Compliant
🟡 - Partial Compliant
🔴 - Not Compliant
⚪ - Requires Further Human Verification
🏷️ - Compliance label

[qodo-free-for-open-source-projects[bot]]

PR Code Suggestions ✨

Explore these optional code suggestions:

Category	Suggestion	Impact
General	Simplify complex and redundant logic Simplify the complex and redundant shell script logic for determining the base branch by prioritizing the remote's default branch and then falling back to common names like master or main. gitconfig [34] -rbm = "!fn(){ base=''; remote_head=$(git symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null || true); remote_branch=${remote_head#origin/}; if [ -n \"$remote_branch\" ] && [ \"$remote_branch\" != \"$remote_head\" ]; then case \"$remote_branch\" in master|main) if git show-ref --verify --quiet \"refs/heads/$remote_branch\"; then base=$remote_branch; elif git show-ref --verify --quiet \"refs/remotes/origin/$remote_branch\"; then base=origin/$remote_branch; fi;; esac; fi; if [ -z \"$base\" ] && git show-ref --verify --quiet refs/heads/master; then base=master; elif [ -z \"$base\" ] && git show-ref --verify --quiet refs/heads/main; then base=main; fi; if [ -z \"$base\" ] && [ -n \"$remote_branch\" ]; then if git show-ref --verify --quiet \"refs/heads/$remote_branch\"; then base=$remote_branch; elif [ -n \"$remote_head\" ] && git show-ref --verify --quiet \"refs/remotes/$remote_head\"; then base=$remote_head; fi; fi; if [ -z \"$base\" ]; then echo 'Both master and main branch not found!' >&2; return 1; fi; git rebase \"$base\" \"$@\"; };fn" +rbm = "!fn(){ base=''; remote_head=$(git symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null); if [ -n \"$remote_head\" ]; then if git show-ref --verify --quiet \"refs/remotes/$remote_head\"; then base=$remote_head; fi; fi; if [ -z \"$base\" ]; then if git show-ref --verify --quiet refs/remotes/origin/main; then base=origin/main; elif git show-ref --verify --quiet refs/remotes/origin/master; then base=origin/master; elif git show-ref --verify --quiet refs/heads/main; then base=main; elif git show-ref --verify --quiet refs/heads/master; then base=master; fi; fi; if [ -z \"$base\" ]; then echo 'Could not determine a default branch to rebase onto.' >&2; return 1; fi; git rebase \"$base\" \"$@\"; };fn" [ ] Apply / Chat <!-- /improve --apply_suggestion=0 --> Suggestion importance[1-10]: 8 __ Why: The suggestion correctly identifies that the shell script logic is overly complex and provides a much simpler, more readable, and more maintainable alternative that achieves the same goal more effectively.	Medium
	Remove unnecessary command chaining Remove the unnecessary || true from the git symbolic-ref command, as it can mask failures and the subsequent logic already handles cases where the command fails. gitconfig [34] -remote_head=$(git symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null || true); +remote_head=$(git symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null); [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 6 __ Why: The suggestion correctly points out that || true is unnecessary and can hide potential errors, and removing it simplifies the command without affecting the logic's correctness.	Low
	Improve accuracy of error message Update the error message "Both master and main branch not found!" to a more generic one, as the new logic also checks for the remote's default branch which may not be master or main. gitconfig [34] -if [ -z \"$base\" ]; then echo 'Both master and main branch not found!' >&2; return 1; fi; +if [ -z \"$base\" ]; then echo 'Could not determine a default branch to rebase onto.' >&2; return 1; fi; [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 5 __ Why: The suggestion correctly identifies that the error message is no longer accurate given the updated logic and proposes a more suitable, generic message.	Low
[ ] More <!-- /improve --more_suggestions=true -->

[PeterDaveHello]

@codex review