search

nucked / git-repo

Automatically exported from code.google.com/p/git-repo
Apache License 2.0
0 stars 0 forks source link

repo sync overrides branch's upstream #204

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago 
repo version v1.12.31      (Also shown with v1.12.28)
git version 2.6.0.rc1.1.g7a2c4af    (Also shown with 2.4.4)
Python 2.7.6 (default, Jun 22 2015, 17:58:13)
[GCC 4.8.2]

What steps will reproduce the problem?
1. Have a repo-backed repository, which default ref "master"
2. In a project proj, have a branch track "origin/feature"
3. run "repo sync proj"
4. cd proj, run "git branch -vv"

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

Expected either current branch to be "master [origin/master]", or "feature 
[origin/feature]"; Instead, current branch is "feature", and it's upstream is 
"origin/master". Local feature branch is also being reset to origin/master.

Original issue reported on code.google.com by avi...@gmail.com on 18 Sep 2015 at 12:03

GoogleCodeExporter commented 9 years ago 
step 2.5: have branch "feature" checked out, and workspace clean.

Original comment by avi...@gmail.com on 18 Sep 2015 at 12:07