From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Michael Ward <mward@smartsoftwareinc.com>
Cc: git@vger.kernel.org
Subject: Re: Git 2 force commits but Git 1 doesn't
Date: Mon, 22 Jun 2020 21:09:53 +0000 [thread overview]
Message-ID: <20200622210953.GQ6531@camp.crustytoothpaste.net> (raw)
In-Reply-To: <8ad16219-2426-6127-b41d-bb3007a9b993@smartsoftwareinc.com>
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
On 2020-06-22 at 20:52:50, Michael Ward wrote:
> 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
next prev parent reply other threads:[~2020-06-22 21:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-22 19:40 Git 2 force commits but Git 1 doesn't Michael Ward
2020-06-22 20:21 ` brian m. carlson
2020-06-22 20:30 ` Michael Ward
2020-06-22 20:31 ` Michael Ward
2020-06-22 20:43 ` brian m. carlson
2020-06-22 20:52 ` Michael Ward
2020-06-22 21:09 ` brian m. carlson [this message]
2020-06-22 22:17 ` Michael Ward
2020-06-23 1:05 ` brian m. carlson
2020-06-23 8:59 ` René Scharfe
2020-06-23 15:30 ` brian m. carlson
2020-06-23 16:42 ` René Scharfe
2020-06-23 19:13 ` brian m. carlson
2020-06-24 13:05 ` René Scharfe
2020-06-23 20:21 ` [PATCH] http-push: ensure unforced pushes fail when data would be lost brian m. carlson
2020-06-23 21:28 ` Eric Sunshine
2020-06-23 21:50 ` brian m. carlson
2020-06-23 21:52 ` [PATCH v2] " brian m. carlson
2020-06-23 22:41 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200622210953.GQ6531@camp.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=mward@smartsoftwareinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.