|
Re: Commit->Push->Push Upstream-> Argh!!! [message #997471 is a reply to message #997460] |
Mon, 07 January 2013 16:39 |
Dennis Putnam Messages: 59 Registered: January 2012 |
Member |
|
|
After a little more research, I decided to try 'git fetch' followed by 'git reset --hard origin/master'. That seemed to work but I don't really understand why I needed to do that. Is 'git pull' simply the wrong way to update my build directory? No changes are ever made since this is just for builds so I don't have to worry about losing commits but I need to understand how to keep this directory current. I know this is really no longer an Egit issue but hopefully someone here can answer without me re-posting everything on another forum. TIA.
[Updated on: Mon, 07 January 2013 16:40] Report message to a moderator
|
|
|
Re: Commit->Push->Push Upstream-> Argh!!! [message #997476 is a reply to message #997471] |
Mon, 07 January 2013 17:23 |
R Shapiro Messages: 386 Registered: June 2011 |
Senior Member |
|
|
Sounds like your clone isn't configured correctly for push, at least on whatever branch you were working on at the time. You need to tell Git how local and remote branches are related to another for push and fetch. Or else you need to tell it dynamically, on each call, by providing ref-spec (Git term for pattern that describes a local -> remote branch mapping) or the EGit equivalent of a ref-spec.
Some of the configuration happens automatically, some doesn't. You can modify the relevant configuration settings via Team -> Remote -> Configure Push to Upstream.
My guess is that the push was a no-op due to misconfiguration, but that EGit still noted the the commits as pushed and therefore no longer amendable [possible EGit bug here]
To figure out more definitely what went wrong we would to know what local branch you were working on and what your local configuration looks like. The latter it stored in .git/config in your clone. You can get a structured list via 'git config --local -l'. In Egit you can also see the logical structure in the "Properties" view of the Git repository.
Most of this is generic Git -- you can find out more about ref-specs and branch mapping in the usual Git reference resources.
Quote:where does a bare repository hide the files anyway?
The bare remote does not store user files anywhere, it stores commits, organized as directed graph to model branching and merging. That's what makes it 'bare' -- there is no working tree and no index. The commit graph is what you're cloning when you do a 'git clone', and the push and fetch operations are moving commits back and forth, not working files.
|
|
|
|
|
|
|
Powered by
FUDForum. Page generated in 0.06147 seconds