How to jump between two repositories ...

> At this point, I wanted to push my changes back to my work repository  
> so I can continue work the next day. So at home, I did a git push. I  
> expect that my work repository has the newest material, but I find  
> that when I do "git status" at work the next day, it tells me that my  
> test.c is "modified" and has already staged it for commit. I need to  
> do a "git reset" followed by "git checkout" to update my work folder  
> to the latest stuff.

> Hello all,
>
> I am currently working on some code at the office that I also want to work 
> with at home. Seems like a good candidate for git. So I created a 
> repository at work and did a "git clone" at home. I've run into some 
> strange behaviour that I don't understand and would appreciate if someone 
> can clarify for me.
>
> Imagine this scenario. At work:
> git init
> edit test.c
> git add test.c
> git commit
>
> Then at home:
> git clone <work git url>
> edit test.c
> git commit -a
> git push

> At this point, I wanted to push my changes back to my work repository so I 
> can continue work the next day. So at home, I did a git push. I expect that 
> my work repository has the newest material, but I find that when I do "git 
> status" at work the next day, it tells me that my test.c is "modified" and 
> has already staged it for commit. I need to do a "git reset" followed by 
> "git checkout" to update my work folder to the latest stuff.
>
> Totally different from my expectation of the repository knowing that it is 
> out of date and then kindly suggesting that I should do a "git update" of 
> some sort. What piece of understanding am I missing to properly "get" what 
> is going on here, and how am I supposed to properly work with this setup?

> On Tue, Dec 04, 2007 at 09:59:57PM -0800, g2 wrote:
>> Hello all,
>>
>> I am currently working on some code at the office that I also want to work 
>> with at home. Seems like a good candidate for git. So I created a 
>> repository at work and did a "git clone" at home. I've run into some 
>> strange behaviour that I don't understand and would appreciate if someone 
>> can clarify for me.
>>
>> Imagine this scenario. At work:
>> git init
>> edit test.c
>> git add test.c
>> git commit
>>
>> Then at home:
>> git clone <work git url>
>> edit test.c
>> git commit -a
>> git push
> 
> You'll be much happier at this point if you ssh into work and then git
> pull from home....
> 
>> At this point, I wanted to push my changes back to my work repository so I 
>> can continue work the next day. So at home, I did a git push. I expect that 
>> my work repository has the newest material, but I find that when I do "git 
>> status" at work the next day, it tells me that my test.c is "modified" and 
>> has already staged it for commit. I need to do a "git reset" followed by 
>> "git checkout" to update my work folder to the latest stuff.
>>
>> Totally different from my expectation of the repository knowing that it is 
>> out of date and then kindly suggesting that I should do a "git update" of 
>> some sort. What piece of understanding am I missing to properly "get" what 
>> is going on here, and how am I supposed to properly work with this setup?
> 
> Git doesn't support pushing to any branch that's checked out somewhere.
> 

>
> Yes it does. It just supports it badly. If there is a work-tree  
> connected to
> the receiving repository and that work-tree is pristine, it would be  
> safe and
> sane to write the newly pushed changes to the connected working tree.
>
> We do all our integration fixups by pushing to repositories with  
> work-trees,
> simply because it's ridiculously inconvenient to add the  
> infrastructure to
> pull to those repos from each individual developer. In that  
> scenario, pushing
> to a checked out branch is highly useful and perfectly safe.
>
> -- 
> Andreas Ericsson                   andreas.ericsson@op5.se
> OP5 AB                             www.op5.se
> Tel: +46 8-230225                  Fax: +46 8-230231

> 
> How do you safely push to the repository? Even if my receiving 
> repository is pristine (the last command I do is a commit), after I push 
> into it, some files in the work-tree are effectively out of date and git 
> says so by thinking they are modified and staged for commit. My original 
> set of example commands illustrates this. What set of commands do you 
> use to avoid the problem?
> 

> I am currently working on some code at the office that I also want  
> to work with at home. Seems like a good candidate for git. So I  
> created a repository at work and did a "git clone" at home. I've run  
> into some strange behaviour that I don't understand and would  
> appreciate if someone can clarify for me.
>
> Imagine this scenario. At work:
> git init
> edit test.c
> git add test.c
> git commit
>
> Then at home:
> git clone <work git url>
> edit test.c
> git commit -a
> git push
>
> At this point, I wanted to push my changes back to my work  
> repository so I can continue work the next day. So at home, I did a  
> git push. I expect that my work repository has the newest material,  
> but I find that when I do "git status" at work the next day, it  
> tells me that my test.c is "modified" and has already staged it for  
> commit. I need to do a "git reset" followed by "git checkout" to  
> update my work folder to the latest stuff.

> On Dec 5, 2007, at 07:59, g2 wrote:
>
>> I am currently working on some code at the office that I also want  
>> to work with at home. Seems like a good candidate for git. So I  
>> created a repository at work and did a "git clone" at home. I've  
>> run into some strange behaviour that I don't understand and would  
>> appreciate if someone can clarify for me.
>>
>> Imagine this scenario. At work:
>> git init
>> edit test.c
>> git add test.c
>> git commit
>>
>> Then at home:
>> git clone <work git url>
>> edit test.c
>> git commit -a
>> git push
>>
>> At this point, I wanted to push my changes back to my work  
>> repository so I can continue work the next day. So at home, I did a  
>> git push. I expect that my work repository has the newest material,  
>> but I find that when I do "git status" at work the next day, it  
>> tells me that my test.c is "modified" and has already staged it for  
>> commit. I need to do a "git reset" followed by "git checkout" to  
>> update my work folder to the latest stuff.
>
> Did you clone a bare repository and push to it?
>
> Here is an excerpt from Git User's Manual:
> "Note that the target of a "push" is normally a bare repository. You  
> can also push to a repository that has a checked-out working tree,  
> but the working tree will not be updated by the push. This may lead  
> to unexpected results if the branch you push to is the currently  
> checked-out branch!"
>
> So to push to your work repository, you should create an  
> intermediary repository between the work and home repositories. You  
> can create it by running:
> $ git clone --bare /git/work/ /git/work.git/
>
> Then you clone normally from the bare repository and pushing to it  
> works fine. After you have pushed your changes to the bare  
> repository, you'll have to pull them to the work repository to get  
> the updates, just like you would do with any public repository.
>
> Another option would be to pull from your home repository to the  
> work repository, if you can access your home computer from the work  
> computer.
>
> --
> Väinö
>

> What I am gathering from this is that I can use git in two ways: 1)  
> as "just another svn" bare git repository, or 2) only pull and don't  
> push, because push causes confusion. I'd be happy to only ever use  
> pull, but I have one machine behind a firewall and can't pull. I can  
> push to a bare git repository like the svn model, but then I would  
> just use svn. What's the value of "push" then?

> What I am gathering from this is that I can use git in two ways: 1)  
> as "just another svn" bare git repository, or 2) only pull and don't  
> push, because push causes confusion. I'd be happy to only ever use  
> pull, but I have one machine behind a firewall and can't pull. I can  
> push to a bare git repository like the svn model, but then I would  
> just use svn. What's the value of "push" then?