From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v3 0/6] "git push --cas/--lockref" renamed to "--force-with-lease"
Date: Mon, 22 Jul 2013 23:43:14 -0700 [thread overview]
Message-ID: <1374561800-938-1-git-send-email-gitster@pobox.com> (raw)
This is mostly unchanged since the previous round, except that
* The option is spelled "--force-with-lease=<ref>:<expect>".
Nobody liked "cas" as it was too technical, many disliked
"lockref" because "lock" sounded as if push by others were
excluded by it while in fact this is to fail us.
The final name implies that it is related to the "--force" that
breaks the "must fast-forward" safety, but "with-lease" part
conveys that there is some reservation with the forcing. The
observation you make before you start rebasing (or you ensure
that everything is expendable and decide to delete) is like
taking a lease on the ref, and as long as the lease is not
broken by others, you can push a non-fast-forward history to
replace what is at the remote.
* The logic to choose default when the option is not given with an
explicit expected value is still "the remote-tracking branch for
the ref being updated", but the documentation warns users against
relying on that semantics, as it was shown to be fragile during
the discussion, and hopefully we will come up with a better and
more robust one to replace it.
The first two preparatory patches are the same since v2. For the
remainder, other than changes necessary to rename the option, the
documentation part of [PATCH 3/6] has been updated to mark forms
without explicit expect value as experimental.
Junio C Hamano (6):
cache.h: move remote/connect API out of it
builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN
remote.c: add command line option parser for "--force-with-lease"
push --force-with-lease: implement logic to populate old_sha1_expect[]
push --force-with-lease: tie it all together
t5533: test "push --force-with-lease"
Documentation/git-push.txt | 77 +++++++++++++++---
builtin/fetch-pack.c | 2 +
builtin/push.c | 19 ++++-
builtin/receive-pack.c | 1 +
builtin/send-pack.c | 26 +++++++
cache.h | 62 ---------------
connect.c | 1 +
connect.h | 13 ++++
fetch-pack.c | 1 +
fetch-pack.h | 1 +
refs.c | 8 --
remote.c | 175 +++++++++++++++++++++++++++++++++++++----
remote.h | 83 ++++++++++++++++++++
send-pack.c | 2 +
t/t5533-push-cas.sh | 189 +++++++++++++++++++++++++++++++++++++++++++++
transport-helper.c | 6 ++
transport.c | 13 ++++
transport.h | 5 ++
upload-pack.c | 1 +
19 files changed, 588 insertions(+), 97 deletions(-)
create mode 100644 connect.h
create mode 100755 t/t5533-push-cas.sh
--
1.8.3.4-980-g8decd39
next reply other threads:[~2013-07-23 6:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-23 6:43 Junio C Hamano [this message]
2013-07-23 6:43 ` [PATCH v3 1/6] cache.h: move remote/connect API out of it Junio C Hamano
2013-07-23 6:43 ` [PATCH v3 2/6] builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN Junio C Hamano
2013-07-23 6:43 ` [PATCH v3 3/6] remote.c: add command line option parser for "--force-with-lease" Junio C Hamano
2013-07-23 6:43 ` [PATCH v3 4/6] push --force-with-lease: implement logic to populate old_sha1_expect[] Junio C Hamano
2013-07-23 6:43 ` [PATCH v3 5/6] push --force-with-lease: tie it all together Junio C Hamano
2013-07-23 6:43 ` [PATCH v3 6/6] t5533: test "push --force-with-lease" Junio C Hamano
2013-07-23 9:33 ` [PATCH v3 0/6] Jakub Narebski
2013-07-23 18:26 ` Junio C Hamano
2013-07-23 21:26 ` Philip Oakley
2013-07-23 23:18 ` Eric Sunshine
2013-08-01 18:05 ` [PATCH v3 7/6] t5540/5541: smart-http does not support "--force-with-lease" Junio C Hamano
2013-08-02 23:13 ` [PATCH v3 8/6] send-pack: fix parsing of --force-with-lease option Junio C Hamano
2013-08-02 23:14 ` [PATCH v3 9/6] push: teach --force-with-lease to smart-http transport 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=1374561800-938-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.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 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.