From: Christopher Head <bugs@chead.ca>
To: git@vger.kernel.org
Subject: Push force-with-lease with multi-URL remote
Date: Sat, 27 Jul 2019 09:54:40 -0700 [thread overview]
Message-ID: <20190727095440.1aac3b3c@amdahl.home.chead.ca> (raw)
[-- Attachment #1: Type: text/plain, Size: 1164 bytes --]
Hi folks,
When a single remote has multiple push URLs, Git’s force-with-lease
logic appears to be:
For each URL:
1. Read refs/heads/mybranch (call this commit X)
2. Read refs/remotes/myremote/mybranch (call this commit Y)
3. Send to the URL an atomic compare-and-swap, replacing Y with X.
4. If step 3 succeeded, change refs/remotes/myremote/mybranch to X.
This means that, assuming both URLs start out identical, the second URL
will always fail because refs/remots/myremote/mybranch has been updated
from Y to X, and therefore the second compare-and-swap fails. I can’t
imagine any situation in which this behaviour is actually useful.
This is what I would expect:
1. Read refs/heads/mybranch (call this commit X)
2. Read refs/remotes/myremote/mybranch (call this commit Y)
3. For each URL:
3a. Send to the URL an atomic compare-and-swap, replacing Y with X.
4. If any (or maybe all) of the CAS operations in 3a succeeded, change
refs/remotes/myremote/mybranch to X.
Thoughts? Does anyone have a use case for the existing behaviour? I
have attached a shell script which constructs some repos and
demonstrates the situation.
Thanks!
--
Christopher Head
[-- Attachment #2: test --]
[-- Type: application/octet-stream, Size: 521 bytes --]
#!/bin/bash
set -e
# Create remote1, remote2, local.
git init --bare remote1
git init --bare remote2
git init local
cd local
git remote add origin ../remote1
git remote set-url --push origin ../remote1
git remote set-url --push --add origin ../remote2
# Add commit A and push.
echo 'hello world' > test.txt
git add test.txt
git commit -m 'Commit A'
git push -u origin master
# Amend to commit B.
echo 'goodbye world' > test.txt
git add test.txt
git commit --amend --no-edit
# Force-push.
git push --force-with-lease
next reply other threads:[~2019-07-27 17:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-27 16:54 Christopher Head [this message]
2019-07-27 17:46 ` Push force-with-lease with multi-URL remote Junio C Hamano
2019-07-27 18:15 ` Christopher Head
2019-07-27 20:57 ` Junio C Hamano
2019-07-27 21:43 ` Christopher Head
2019-07-29 5:19 ` Junio C Hamano
2019-07-29 10:20 ` Jeff King
2019-07-29 13:33 ` Junio C Hamano
2019-07-29 13:47 ` Christopher Head
2019-07-29 19:20 ` Jeff King
2019-07-29 21:44 ` Junio C Hamano
2019-07-29 22:29 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190727095440.1aac3b3c@amdahl.home.chead.ca \
--to=bugs@chead.ca \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).