Skip to content
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

branch: ignore git tracking branches for rename warning #4112

Merged
merged 1 commit into from
Jul 18, 2024

Conversation

scott2000
Copy link
Contributor

Prevents a warning from being printed when renaming branches in a colocated repo, since git tracking branches were being considered as remote tracking branches.

Resolves #4111.

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

Prevents a warning from being printed when renaming branches in a
colocated repo, since git tracking branches were being considered as
remote tracking branches.
Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

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

Oops, thanks.

It's unclear whether create foo should be allowed when foo@git exists in non-colocated repo, but the new behavior wouldn't be worse than the current state.

@scott2000 scott2000 merged commit d5c526f into jj-vcs:main Jul 18, 2024
17 checks passed
@scott2000 scott2000 deleted the rename-warning branch July 18, 2024 22:27
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.

Branch rename prints unnecessary warning in colocated repos
2 participants