Skip to content

Update base.theme.bash #2327

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.

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

Merged
merged 4 commits into from
Jul 13, 2025
Merged

Update base.theme.bash #2327

merged 4 commits into from
Jul 13, 2025

Conversation

zou000
Copy link
Contributor

@zou000 zou000 commented Jul 11, 2025

Add missing SCM_BRANCH variable for p4

Description

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • If my change requires a change to the documentation, I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • If I have added a new file, I also added it to clean_files.txt and formatted it using lint_clean_files.sh.
  • I have added tests to cover my changes, and all the new and existing tests pass.

@akinomyoga
Copy link
Contributor

This change anticipates the case when SCM_BRANCH is globally set. Then, I believe SCM_BRANCH should also be cleared before lines 339-341, which append values to SCM_BRANCH.

@zou000
Copy link
Contributor Author

zou000 commented Jul 11, 2025

This change anticipates the case when SCM_BRANCH is globally set. Then, I believe SCM_BRANCH should also be cleared before lines 339-341, which append values to SCM_BRANCH.

SCM_BRANCH was not set before coming in this branch. I moved it to scm_prompt_vars so it will be initialized for all scm.

@seefood seefood self-assigned this Jul 13, 2025
Copy link
Contributor

@seefood seefood left a comment

Choose a reason for hiding this comment

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

sounds legit

@seefood seefood merged commit 7a4e86d into Bash-it:master Jul 13, 2025
6 checks passed
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.

3 participants