Re: How to jump between two repositories ...

From: Andreas Ericsson <ae@op5.se>
Date: Dec 5, 2007, 08:45 UTC
Message-ID: <47566526.9010900@op5.se>
In-Reply-To: <20071205061425.GE11098@fieldses.org>

J. Bruce Fields wrote:

Show 38 quoted lines

> 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