Re: Problem with git push over <hostname>:/path protocol (ssh)
- From
Bill Lear <rael@zopyra.com>
- Date
- Jan 24, 2007, 20:35 UTC
- Message-ID
- <17847.49939.964820.170771@lisa.zopyra.com>
- In-Reply-To
- <Pine.LNX.4.64.0701241453410.20138@iabervon.org>
On Wednesday, January 24, 2007 at 15:04:54 (-0500) Daniel Barkalow writes:
Show 11 quoted lines
>... >Git gets unhappy if you push into a branch that's checked out. It doesn't >update the index or working directory, so the state after the push looks >like the user reverted the patch in the working directory and updated the >index. > >It should probably give an error message and stop the push; dealing with a >checked out version conceptually requires a merge, which push doesn't do. >Most likely, you want a clone of the upstream repository, and a >post-update hook in the upstream repository that goes into the clone and >pulls the changes. (And possibly does more stuff after that)
Wow, this is a pain.
We actually would prefer that our public (collaborative) repositories be bare, but we could not find a way to pull into them without getting all the files checked out into the working tree.
Is there a way to do a pull and leave a repo bare, perchance?
Bill