From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 7/7] push: document --lockref
Date: Tue, 09 Jul 2013 22:27:43 +0200 [thread overview]
Message-ID: <51DC723F.2000602@alum.mit.edu> (raw)
In-Reply-To: <1373399610-8588-8-git-send-email-gitster@pobox.com>
On 07/09/2013 09:53 PM, Junio C Hamano wrote:
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> Documentation/git-push.txt | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
> index f7dfe48..e7c8bd6 100644
> --- a/Documentation/git-push.txt
> +++ b/Documentation/git-push.txt
> @@ -11,6 +11,7 @@ SYNOPSIS
> [verse]
> 'git push' [--all | --mirror | --tags] [--follow-tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
> [--repo=<repository>] [-f | --force] [--prune] [-v | --verbose] [-u | --set-upstream]
> + [--lockref[=<refname>[:[<expect>]]]]
> [--no-verify] [<repository> [<refspec>...]]
>
> DESCRIPTION
> @@ -146,6 +147,31 @@ already exists on the remote side.
> to the `master` branch). See the `<refspec>...` section above
> for details.
>
> +--lockref::
> +--lockref=<refname>::
> +--lockref=<refname>:<expect>::
> + When updating <refname> at the remote, make sure that the
> + ref currently points at <expect> (an object name), and else
> + fail the push, even if `--force` is specified. If only
> + <refname> is given, the expected value is taken from the
> + remote-tracking branch that holds the last-observed value of
> + the <refname>. <expect> given as an empty string means the
> + <refname> should not exist and this push must be creating
> + it. If `--lockref` (without any value) is given, make sure
> + each ref this push is going to update points at the object
> + our remote-tracking branch for it points at.
I thought that the explanation in your patch 4/7 log message was
clearer. In particular, I think that documenting the forms separately,
as you did in the log message, makes it unambiguous, whereas for example
the distinction in prose between "If only <refname> is given" and
"<expect> given as an empty string" is easy to miss.
Does "--lockref" only apply to references that need non-ff updates, or
to all references that are being pushed? This is mostly interesting for
the zero-argument form (especially if a config option is invented to
make this the default), but the question should also be answered for the
other forms.
> +This is meant to make `--force` safer to use. Imagine that you have
> +to rebase what you have already published. You will have to
> +`--force` the push to replace the history you originally published
> +with the rebased history. If somebody else built on top of your
> +original history while you are rebasing, the tip of the branch at
s/are/were/
> +the remote may advance with her commit, and blindly pushing with
s/advance/have advanced/
> +`--force` will lose her work. By using this option to specify that
> +you expect the history you are updating is what you rebased and want
> +to replace, you can make sure other people's work will not be losed
s/losed/lost/
> +by a forced push. in such a case.
s/push./push/ or s/in such a case.//
> +
> --repo=<repository>::
> This option is only relevant if no <repository> argument is
> passed in the invocation. In this case, 'git push' derives the
>
Another minor point: "git update-ref" allows either 40 "0" or the empty
string to check that the ref doesn't already exist. For consistency it
might be nice to accept 40 "0" here as well.
I still really like the idea of the feature.
<bikeshed>
The name "--lockref" is OK, but for me it's less a question of
"locking", because as far as the user is concerned the push is an atomic
operation so there is no sense of a "lock" that is being held for a
finite period of time. For me it is more a question of "checking" or
"verifying". I see that the word "verify" already has a meaning for
this command, so maybe "--checkref" or "--checkold" or "--checkoldref"?
</bikeshed>
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
next prev parent reply other threads:[~2013-07-09 20:27 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-02 20:57 [RFD] Making "git push [--force/--delete]" safer? Junio C Hamano
2013-07-02 22:55 ` Johan Herland
2013-07-03 6:34 ` Johan Herland
2013-07-03 8:49 ` Junio C Hamano
2013-07-03 10:00 ` Johan Herland
2013-07-03 10:06 ` Jonathan del Strother
2013-07-03 10:11 ` Johan Herland
2013-07-03 10:50 ` Michael Haggerty
2013-07-03 12:06 ` Johannes Sixt
2013-07-03 19:53 ` Junio C Hamano
2013-07-04 5:37 ` Johannes Sixt
2013-07-04 5:46 ` Junio C Hamano
2013-07-03 19:50 ` Junio C Hamano
2013-07-03 20:18 ` Junio C Hamano
2013-07-03 19:48 ` Junio C Hamano
2013-07-09 19:53 ` [PATCH 0/7] safer "push --force" with compare-and-swap Junio C Hamano
2013-07-09 19:53 ` [PATCH 1/7] cache.h: move remote/connect API out of it Junio C Hamano
2013-07-09 19:53 ` [PATCH 2/7] builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN Junio C Hamano
2013-07-09 19:53 ` [PATCH 3/7] push: beginning of compare-and-swap "force/delete safety" Junio C Hamano
2013-07-09 19:53 ` [PATCH 4/7] remote.c: add command line option parser for --lockref Junio C Hamano
2013-07-16 22:13 ` John Keeping
2013-07-17 17:06 ` Junio C Hamano
2013-07-17 17:09 ` Junio C Hamano
2013-07-09 19:53 ` [PATCH 5/7] push --lockref: implement logic to populate old_sha1_expect[] Junio C Hamano
2013-07-09 19:53 ` [PATCH 6/7] t5533: test "push --lockref" Junio C Hamano
2013-07-09 19:53 ` [PATCH 7/7] push: document --lockref Junio C Hamano
2013-07-09 20:17 ` Aaron Schrab
2013-07-09 20:39 ` Junio C Hamano
2013-07-09 20:24 ` Johannes Sixt
2013-07-09 20:37 ` Junio C Hamano
2013-07-09 20:55 ` Johannes Sixt
2013-07-09 22:09 ` Junio C Hamano
2013-07-09 23:08 ` Junio C Hamano
2013-07-11 21:10 ` Johannes Sixt
2013-07-11 21:57 ` Junio C Hamano
2013-07-11 22:14 ` Junio C Hamano
2013-07-12 17:21 ` Johannes Sixt
2013-07-12 17:40 ` Junio C Hamano
2013-07-12 20:00 ` Johannes Sixt
2013-07-12 21:19 ` Junio C Hamano
2013-07-13 6:52 ` Johannes Sixt
2013-07-13 18:14 ` Junio C Hamano
2013-07-13 20:08 ` Junio C Hamano
2013-07-13 21:11 ` Johannes Sixt
2013-07-14 14:28 ` John Keeping
2013-07-13 20:17 ` Johannes Sixt
2013-07-14 19:17 ` Junio C Hamano
2013-07-14 20:21 ` Johannes Sixt
2013-07-14 20:34 ` Jonathan Nieder
2013-07-14 20:49 ` Jonathan Nieder
2013-07-14 20:59 ` Johannes Sixt
2013-07-14 21:28 ` Jonathan Nieder
2013-07-15 4:10 ` Junio C Hamano
2013-07-15 4:44 ` Jonathan Nieder
2013-07-15 15:37 ` Junio C Hamano
2013-07-15 20:30 ` Johannes Sixt
2013-07-15 3:50 ` Junio C Hamano
2013-07-15 15:47 ` Default expectation of --lockref Junio C Hamano
2013-07-15 20:27 ` [PATCH 7/7] push: document --lockref Johannes Sixt
2013-07-09 21:37 ` Marc Branchaud
2013-07-09 20:27 ` Michael Haggerty [this message]
2013-07-09 20:42 ` 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
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=51DC723F.2000602@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).