Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 365344 - unexpected results in git status - changes showing across branches
Summary: unexpected results in git status - changes showing across branches
Status: RESOLVED INVALID
Alias: None
Product: Orion
Classification: ECD
Component: Git (show other bugs)
Version: 0.3   Edit
Hardware: PC Windows 7
: P3 major (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-12-01 12:56 EST by Susan McCourt CLA
Modified: 2011-12-02 14:01 EST (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Susan McCourt CLA 2011-12-01 12:56:34 EST
Latest build orion.eclipse.org
- I am working in a topic branch with changes to two files
- I switched to master to fetch the latest code and work on something else.
- When I run git status I see those two file changes (from my topic branch) in git status for master.  I thought...maybe I had accidentally saved the changes to master, so I checked out/discarded the changes.  Now there are no changes in git status (good).
- Switched back to topic branch and my changes are gone.  
- Made changes again in the topic branch.
- Switch to master and the git status is showing the changes.
Comment 1 Susan McCourt CLA 2011-12-02 13:51:31 EST
Tried a simple case and it appears that something is very broken with branches.

- go to git repo page, org.eclipse.orion.client, Branches
- create branch "test"
- checkout branch "test"
- change a file.  (I edited org.eclipse.orion.client/bundles/org.eclipse.orion.client.core/web/orion/log.js)
- git status, see you see the change.
- back to repo page, checkout branch "master"
- git status, you still see the change.
Comment 2 Susan McCourt CLA 2011-12-02 14:01:08 EST
sorry for the noise.  I've had a git brain fart.
The changes are uncommitted so of course they carry over.
Not sure what it is about my workflow today/yesterday that led me to expect otherwise.