Re: Git 2 force commits but Git 1 doesn't
- From
- Michael Ward <mward@smartsoftwareinc.com>
- Date
- Jun 22, 2020, 20:52 UTC
- Message-ID
- <8ad16219-2426-6127-b41d-bb3007a9b993@smartsoftwareinc.com>
- In-Reply-To
- <20200622204346.GP6531@camp.crustytoothpaste.net>
Using the steps from my original email for how I had the repository set up (any user authentication scheme works), clone 2 copies from that repository (call them A and B). Make, commit, and push a change in A. Then make, commit, and push a change in B (without first pulling). With the 1.8 client, B will prompt that you're out of date and need to update. With the 2.26 client, B's commit will be pushed and be forced.
Thanks for your help.
Michael
On 6/22/20 3:43 PM, brian m. carlson wrote:
Show 16 quoted lines
> On 2020-06-22 at 20:30:06, Michael Ward wrote: >> Versions in use are 2.27.2 and 1.8.3.1. This behavior is seen with regular >> pushes. >> >> I'll look into the http-backend functionality. If that will help control >> that, we'll definitely want to use that instead. What surprises me, though, >> is that even with DAV a 1.8 client appears to work correctly in that it will >> warn the user that their push is about to clobber the head, but 2.27 >> doesn't. > If you can provide a set of reproduction steps for this, I'd be happy to > write a patch to fix it. We should do the right thing for non-force > pushes in both cases. > > I will say that overall, few people use the DAV-based protocol, since > it's significantly less efficient than the smart protocol, so it doesn't > surprise me that there may be bugs there.