Re: Working copy revision and push pain
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 24, 2008, 15:22 UTC
- Message-ID
- <alpine.LSU.1.00.0803241621210.4353@racer.site>
- In-Reply-To
- <200803231720.44320.johan@herland.net>
Hi,
On Sun, 23 Mar 2008, Johan Herland wrote:
Show 19 quoted lines
> I'm starting to think it's worth changing the default behaviour of push > as follows: > > Upon receiving a push into a non-bare repository, if the working copy is > on the same branch as is being pushed, then refuse the push with a > helpful message describing why the push was refused, and how to resolve > this issue (i.e. referring to the tutorials you mention). > > This would: > - Not clobber the working copy > - Tell newbies what happened and why > - Hopefully make this issue pop up less frequently > - Not affect you if you only push into bare repos > - Not affect you if you take care to never push into a checked-out > branch > > Of course, you should be able to set a config option to get the old > behaviour, and from there you can write hooks to either update the > working copy, or detach HEAD, or whatever you please.
I think I sent out a sensible patch, which does not change the behaviour in existing repositories. This should be safer (read: nicer) for Git old-timers.
Ciao, Dscho