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

Left Panel: Fixup "is merged" status issues #9078

Merged
merged 1 commit into from Apr 17, 2021

Conversation

mstv
Copy link
Member

@mstv mstv commented Apr 15, 2021

I hope it
Fixes #9065

Proposed changes

  • Cancel ROT background task before rebuilding the tree
  • Always set the ToolTipText

Screenshots

N/A

Test methodology

  • manual

Test environment(s)

  • Git Extensions 33.33.33
  • Build c60193f
  • Git 2.31.1.windows.1
  • Microsoft Windows NT 10.0.19042.0
  • .NET Framework 4.8.4341.0
  • DPI 96dpi (no scaling)

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

- Cancel ROT background task before rebuilding the tree
- Always set the ToolTipText
@mstv mstv self-assigned this Apr 15, 2021
@RussKie
Copy link
Member

RussKie commented Apr 16, 2021

I hope it
Fixes ...

😄 as long as you can no longer repro the original bug

Worth taking into 3.5 too

@mstv mstv merged commit 33315ac into gitextensions:master Apr 17, 2021
@ghost ghost added this to the 3.6 milestone Apr 17, 2021
@mstv mstv deleted the fix/9065_rot_update branch April 17, 2021 08:10
mstv added a commit that referenced this pull request Apr 17, 2021
- Cancel ROT background task before rebuilding the tree
- Always set the ToolTipText

(cherry picked from commit 33315ac)
RussKie pushed a commit that referenced this pull request Apr 18, 2021
- Cancel ROT background task before rebuilding the tree
- Always set the ToolTipText

(cherry picked from commit 33315ac)
RussKie pushed a commit that referenced this pull request Apr 18, 2021
- Cancel ROT background task before rebuilding the tree
- Always set the ToolTipText

(cherry picked from commit 33315ac)
mstv added a commit that referenced this pull request Apr 18, 2021
This reverts commit 400edd3,
which applied the same change a second time.
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.

[NBug] NullReferenceException in RepoObjectsTree+BaseBranchLeafNode.set_IsMerged
2 participants