From: Michael Ward <mward@smartsoftwareinc.com>
To: git@vger.kernel.org
Subject: Git 2 force commits but Git 1 doesn't
Date: Mon, 22 Jun 2020 14:40:15 -0500 [thread overview]
Message-ID: <dea24348-770c-1228-115d-23153fbecebd@smartsoftwareinc.com> (raw)
We have some repositories we are hosting here using Apache's DAV module
to handle remote connections.
The repositories are created using the following:
mkdir [reponame].git
cd [reponame].git
git --bare init
git update-server-info
Our Apache location directive is as follows:
<Location /[reponame].git>
DAV on
AuthType Basic
AuthName "Git"
AuthBasicProvider ldap
AuthLDAPUrl [ldap server info]
<RequireAny>
require [ldap filter]
</RequireAny>
</Location>
The repository config generates with the values in the core section
below, and we add the receive and advice sections:
[core]
repositoryformatversion = 0
filemode = true
bare = true
[receive]
denyNonFastForwards = true
denyDeletes = true
[advice]
pushFetchFirst = true
The odd behavior comes when we have git 1 vs git 2 clients attempting to
push in changes on the same branch. Git 1 clients will prompt the user
that they are out of date and need to pull. Git 2 clients don't and will
force push and overwrite the head revision. This occurs with either Git
1 or Git 2 on the server.
We've tested this with the latest Git 2 client on Fedora 32 and Git 1
client on CentOS 7.8. The other oddity is that even when the Git 2
client does a pull to receive changes before making changes and pushing,
when another user pulls the change, there is a message shown that a
commit was forced.
What am I missing in the repository settings to prevent forced pushes
from working and force users to pull before being able to push?
Thanks!
Michael Ward
next reply other threads:[~2020-06-22 19:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-22 19:40 Michael Ward [this message]
2020-06-22 20:21 ` Git 2 force commits but Git 1 doesn't 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
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=dea24348-770c-1228-115d-23153fbecebd@smartsoftwareinc.com \
--to=mward@smartsoftwareinc.com \
--cc=git@vger.kernel.org \
/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).