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 20:43:46 +0000 [thread overview]
Message-ID: <20200622204346.GP6531@camp.crustytoothpaste.net> (raw)
In-Reply-To: <a42d038f-bf14-8f1a-927e-7488796e7710@smartsoftwareinc.com>
[-- Attachment #1: Type: text/plain, Size: 898 bytes --]
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.
--
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 20:44 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 [this message]
2020-06-22 20:52 ` Michael Ward
2020-06-22 21:09 ` brian m. carlson
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=20200622204346.GP6531@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).