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

            Ascending order - Click to sort in descending order
            No builds found.
            Chris Williams created issue -
            Chris Williams made changes -
            Field Original Value New Value
            Status Open [ 1 ] In Progress [ 3 ]
            Hide
            Permalink
            Chris Williams added a comment -

            Pushed fix to development.

            Show
            Chris Williams added a comment - Pushed fix to development.
            Chris Williams made changes -
            Status In Progress [ 3 ] Resolved [ 5 ]
            Resolution Fixed [ 1 ]
            Ingo Muschenetz made changes -
            Fix Version/s Aptana Studio 3.0.6 [ 12271 ]
            Fix Version/s Aptana Studio 3.1 [ 11505 ]
            Ingo Muschenetz made changes -
            Fix Version/s Aptana Studio 3.0.7 [ 12373 ]
            Fix Version/s Aptana Studio 3.0.6 [ 12271 ]
            Hide
            Permalink
            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.
            Joel Witt (Inactive) made changes -
            Labels git git question
            Hide
            Permalink
            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.
            Chris Williams made changes -
            Resolution Fixed [ 1 ]
            Status Resolved [ 5 ] Reopened [ 4 ]
            Chris Williams made changes -
            Status Reopened [ 4 ] Resolved [ 5 ]
            Resolution Fixed [ 1 ]
            Hide
            Permalink
            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.
            Clayton Headley (Inactive) made changes -
            Status Resolved [ 5 ] Closed [ 6 ]
            Nikolai Derzhak made changes -
            Workflow Appc-Jira [ 93174 ]  PyDev migration copy of Appc-Jira [ 115875 ]
            Nikolai Derzhak made changes -
            Workflow  PyDev migration copy of Appc-Jira [ 115875 ] Appc-Jira [ 123517 ]
            Transition Time In Source Status Execution Times Last Executer Last Execution Date
            Open Open In Progress In Progress
            		6d 2h 15m 1 Chris Williams 20/Sep/11 4:51 AM
            In Progress In Progress Resolved Resolved
            		1d 18h 40m 1 Chris Williams 21/Sep/11 11:32 PM
            Resolved Resolved Reopened Reopened
            		144d 9m 1 Chris Williams 12/Feb/12 10:41 PM
            Reopened Reopened Resolved Resolved
            		5s 1 Chris Williams 12/Feb/12 10:41 PM
            Resolved Resolved Closed Closed
            		71d 2h 48m 1 Clayton Headley (Inactive) 24/Apr/12 2:29 AM

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Development