Skip to content

fix(Push): fix false positive detection of "detached head" state #11999

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Oct 23, 2024
Merged

fix(Push): fix false positive detection of "detached head" state #11999

merged 1 commit into from
Oct 23, 2024

Conversation

pmiossec
Copy link
Member

when branch name contains brackets.

fixes #11997 and #11970

Screenshots

Before

After

image

Test methodology

  • Manual

Test environment(s)

  • Git Extensions 33.33.33
  • Build 2b8f800
  • Git 2.45.0.windows.1 (recommended: 2.46.0 or later)
  • Microsoft Windows NT 10.0.22631.0
  • .NET 8.0.8
  • DPI 96dpi (no scaling)
  • Portable: False
  • Microsoft.WindowsDesktop.App Versions
    Microsoft.WindowsDesktop.App 6.0.31 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]
    Microsoft.WindowsDesktop.App 6.0.33 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]
    Microsoft.WindowsDesktop.App 7.0.20 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]
    Microsoft.WindowsDesktop.App 8.0.7 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]
    Microsoft.WindowsDesktop.App 8.0.8 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).

✒️ I contribute this code under The Developer Certificate of Origin.

@pmiossec
Copy link
Member Author

pmiossec commented Oct 22, 2024 •
edited
Loading

@JeremiaAu & @tih2010 Could you test this fix?

@JeremiaAu
Copy link

JeremiaAu commented Oct 23, 2024 •
edited
Loading

I can confirm that the fix works.

Test Environment

  • Git Extensions 33.33.33
  • Build 2b8f800
  • Git 2.46.0.windows.1
  • Microsoft Windows NT 10.0.22631.0
  • .NET 8.0.10
  • DPI 96dpi (no scaling)
  • Portable: False
  • Microsoft.WindowsDesktop.App Versions
    Microsoft.WindowsDesktop.App 6.0.33
    Microsoft.WindowsDesktop.App 8.0.10

@pmiossec pmiossec merged commit a38b59c into gitextensions:master Oct 23, 2024
4 checks passed
@pmiossec pmiossec deleted the fix/formpush_detached_head branch October 23, 2024 23:07
@RussKie RussKie added this to the 5.1 milestone Oct 29, 2024
@mstv mstv mentioned this pull request Oct 31, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RussKie RussKie RussKie approved these changes

@mstv mstv mstv approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
5.1
Development

Successfully merging this pull request may close these issues.

"No branch is selected, cannot push" due to bracket(s) in branch name
4 participants
@pmiossec @JeremiaAu @RussKie @mstv