guberm / tortoisegit

Automatically exported from code.google.com/p/tortoisegit
0 stars 0 forks source link

Remote Branch box on Sync screen should remember settings #2259

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago
What steps will reproduce the problem?
1. Open "Git Sync" screen
2. Delete contents of remote branch box
3. Click "Fetch" to fetch all branches from the remote URL
4. Click OK
5. Open "Git Sync" screen again
6. Notice that the Remote Branch box has been re-populated with the branch name 
again.
7. Click OK. Notice that you only fetched one branch and you may mistakenly 
believe you updated all branches.

What is the expected output? What do you see instead?

If I Fetch using no branch (to fetch all branches), the Sync window should 
remember this and not auto-populate the branch name. 

What version of TortoiseGit and msysgit are you using? On
what operating system?

1.8.8
Win 7
git version 1.7.10.msysgit.1

Please provide any additional information below.

This routinely causes confusion with developers as it can appear very similar 
when fetching 1 branch vs fetching all branches, and it's annoying having to 
delete it all the time.

Also note that "Remote Update" fetches all branches from all remotes, 
regardless of whether the remote branch is populated, which is inconsistent.

Original issue reported on code.google.com by mik...@gmail.com on 14 Aug 2014 at 2:35

GoogleCodeExporter commented 9 years ago
remember: because the local branch has setup a remote tracking branch
git remote update does not filter which branch to update

Original comment by ch3co...@gmail.com on 14 Aug 2014 at 3:33

GoogleCodeExporter commented 9 years ago
Fetching the tracking branch on its own (without fetching the other branches) 
is only useful for a most basic, centralised workflow:
https://www.atlassian.com/git/workflows#!workflow-centralized.

Anyone using a more complex workflow, e.g.
https://www.atlassian.com/git/workflows#!workflow-feature-branch
https://www.atlassian.com/git/workflows#!workflow-gitflow
https://www.atlassian.com/git/workflows#!workflow-forking

Will be largely rebasing and merging onto _other branches_ rather than their 
tracking branch, hence the fetch screen defaulting to the tracking branch is 
unhelpful.

For example, if I work on "features/branch-XYZ" and I want to fetch latest 
changes, it will more likely be "remoteABC/master" than 
"remoteABC/features/branch-XYZ".

Regardless, defaulting to _what you last did_ seems better than assuming 
everyone is using a most basic (and bad) workflow.

Additionally, if you are using a basic workflow, where more than 1 developer is 
pushing to the same branch, there should be no problem fetching all branches, 
since there aren't any.

Original comment by mik...@gmail.com on 14 Aug 2014 at 4:40