Aptana Studio
  1. Aptana Studio
  2. APSTUD-3470

New git branches created in dialog don't default to tracking when remote is origin

    Details

    • Type: Bug Bug
    • Status: Closed
    • Priority: Low Low
    • Resolution: Fixed
    • Affects Version/s: Aptana Studio 3.0.4
    • Fix Version/s: Aptana Studio 3.0.7
    • Component/s: None
    • Labels:

      Description

      If I'm creating a new git branch, I often want to make tracking the default. We should probably be more liberal in setting the checkbox to selected in various cases:

      • if the start point is from remote 'origin'?
      • if the remote branch name and local name match?
      • according to value from git config branch.autosetupmerge - if true, then any branch with a remote starting point should default to tracking...

        Activity

        Hide
        Chris Williams added a comment -

        Pushed fix to development.

        Show
        Chris Williams added a comment - Pushed fix to development.
        Hide
        Joel Witt (Inactive) added a comment -

        Is the GUI supposed to auto-select the checkbox if any of the three conditions are true, currently the GUI does not (please see capture at http://www.screencast.com/t/zAmCJHm7Rqy).

        Also, is there a way to set the value of git config branch.autosetupmerge.

        Show
        Joel Witt (Inactive) added a comment - Is the GUI supposed to auto-select the checkbox if any of the three conditions are true, currently the GUI does not (please see capture at http://www.screencast.com/t/zAmCJHm7Rqy ). Also, is there a way to set the value of git config branch.autosetupmerge.
        Hide
        Chris Williams added a comment -

        We currently just consult the branch.autosetupmerge value in the git config. To set that value, open teh Terminal view and then run "git config --global branch.autosetupmerge true". That will set it true for all git repos.

        Show
        Chris Williams added a comment - We currently just consult the branch.autosetupmerge value in the git config. To set that value, open teh Terminal view and then run "git config --global branch.autosetupmerge true". That will set it true for all git repos.
        Hide
        Clayton Headley (Inactive) added a comment -

        Verified fixed in Windows 7, Mac OS 10.7.3 and Ubuntu 11.10 using Titanium Studio build: 2.0.2.201204231719. Closing ticket.

        Show
        Clayton Headley (Inactive) added a comment - Verified fixed in Windows 7, Mac OS 10.7.3 and Ubuntu 11.10 using Titanium Studio build: 2.0.2.201204231719. Closing ticket.

          People

          • Assignee:
            Chris Williams
            Reporter:
            Chris Williams
          • Watchers:
            0 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development