Re: Git 2 force commits but Git 1 doesn't

From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Jun 22, 2020, 21:09 UTC
Message-ID: <20200622210953.GQ6531@camp.crustytoothpaste.net>
In-Reply-To: <8ad16219-2426-6127-b41d-bb3007a9b993@smartsoftwareinc.com>

On 2020-06-22 at 20:52:50, Michael Ward wrote:

Show 6 quoted lines

> 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.

I think we're going to need a more specific set of reproduction steps, because adding the following to t5540 succeeds (starting on branch "dev"):

test_expect_success 'non-force push fails if not up to date' '
	git push origin dev &&
	git reset --hard HEAD^ &&
	: >path3 &&
	git add path3 &&
	test_tick &&
	git commit -m dev &&
	test_must_fail git push origin dev &&
	git push origin +dev
'

That means that this is working in at least some cases. If you're still seeing this, can you provide a set of commands (e.g., a shell script) to initialize and create a new repository that triggers this, provided that "origin" refers to a suitable remote?

-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204