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

Misc improvements #110

Merged

Conversation

jeffason
Copy link
Contributor

@jeffason jeffason commented Jun 8, 2023

  1. Support status branch patterns (e.g. "release/*")
  2. Force restart the editor when Plugins/ binary changes detected
  3. Bugfix: read-only file attribute gets out of sync with LFS lock status

@mastercoms mastercoms merged commit e6d2f6e into ProjectBorealis:release Jun 11, 2023
Parameters.Add(TEXT("--list"));
bool bResults = RunCommand(TEXT("branch"), InPathToGitBinary, InRepositoryRoot, Parameters, { PatternMatch },
InfoMessages, ErrorMessages);
if (bResults && InfoMessages.Num() > 0)

Choose a reason for hiding this comment

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

when using origin/* this includes origin/HEAD -> origin/main right? Does this break the feature, or does it not matter?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not at a computer but why would ‘git branch —list’ return origin/HEAD which is not a branch?

Choose a reason for hiding this comment

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

Why, I don't know. but in all my git(lab) projects it does:

C:\Users\...>git branch --remote --list origin/*
  origin/HEAD -> origin/main
  origin/main

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Did you confirm this is broken by setting a breakpoint in the debugger?

It seems atypical to define origin/* as a status branch pattern but if it breaks then we should handle it elegantly.

These branch patterns were added to support common, standardized branching patterns in git like gitflow - https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

Copy link

@meruiden meruiden Jun 18, 2023

Choose a reason for hiding this comment

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

screenshot1

See screenshot, confirmed that it adds it to the results

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good find. Try git branch --format='%(refname:short)'

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