Switching branch and hit 'pull' to fast causes a pull of the old branch into the new one

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: Highest
    • 2.1.10.0
    • Affects Version/s: 2.1.2.5
    • Component/s: General, Git
    • None
    • Severity 1 - Critical

      working with git:

      switching branch and hit 'pull' sometimes leads to an unwanted merge, as the 'old' branch is selected.

      e.g.

      actual branch is "branch1"

      now switching branch to "branch2" and hit 'pull' -> active branch is "branch2" but in the pull window there is still "branch1" selected to pull (should be "branch2"). If this isn't noticed by the user, this results of pulling the sources of "branch1" into "branch2", which might result in an unwanted merge of branch1 into branch2. 

      Seems to be a timing bug, imho the push and pull options should be disabled while switching a branch. 

      This is especially annoying if fast forward is not disabled. 

       

      UPDATE: SEEMS TO BE RESOLVED WITH 2.1.10.0

      UPDATE: Reproduced with 2.3.1.0 on the first try. 

        

        1. fast-pull-bug.png
          59 kB
          strange17
        2. Sourcetree suggest pulling master branch while on dev.png
          100 kB
          Robert Sirre
        3. SRCTREEWIN-7592-1.PNG
          16 kB
          Robert Sirre
        4. SRCTREEWIN-7592-2.PNG
          15 kB
          Robert Sirre

            Assignee:
            Unassigned
            Reporter:
            Yves Dünow
            Votes:
            6 Vote for this issue
            Watchers:
            4 Start watching this issue

              Created:
              Updated:
              Resolved: