From: Junio C Hamano <gitster@pobox.com>
To: John Keeping <john@keeping.me.uk>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] push: allow pushing new branches with --force-with-lease
Date: Mon, 25 Jul 2016 10:28:01 -0700 [thread overview]
Message-ID: <xmqq4m7d7hlq.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <6b401124e734d4f5486003459e586cc05c7843e8.1469287889.git.john@keeping.me.uk> (John Keeping's message of "Sat, 23 Jul 2016 16:31:57 +0100")
John Keeping <john@keeping.me.uk> writes:
> If there is no upstream information for a branch, it is likely that it
> is newly created and can safely be pushed under the normal fast-forward
> rules. Relax the --force-with-lease check so that we do not reject
> these branches immediately but rather attempt to push them as new
> branches, using the null SHA-1 as the expected value.
>
> In fact, it is already possible to push new branches using the explicit
> --force-with-lease=<branch>:<expect> syntax, so all we do here is make
> this behaviour the default if no explicit "expect" value is specified.
I like the loss of an extra field from "struct ref".
I suspect that the if/else cascade in the loop in apply_cas() can
also be taught that ':' followed by an empty string asks to check
that the target ref does not exist, in order to make it a bit more
useful for folks who do not rely on the "use the last observed
status of the tracking branch".
That would make the "explicit" test much less cumbersome to read.
> +test_expect_success 'new branch covered by force-with-lease (explicit)' '
> + setup_srcdst_basic &&
> + (
> + cd dst &&
> + git branch branch master &&
> + git push --force-with-lease=branch:0000000000000000000000000000000000000000 origin branch
> + ) &&
next prev parent reply other threads:[~2016-07-25 17:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-23 15:31 [PATCH] push: allow pushing new branches with --force-with-lease John Keeping
2016-07-25 17:28 ` Junio C Hamano [this message]
2016-07-25 21:59 ` [PATCH v2 0/3] " John Keeping
2016-07-25 22:21 ` Junio C Hamano
2016-07-26 20:44 ` [PATCH v3 " John Keeping
2016-07-26 20:44 ` [PATCH v3 1/3] Documentation/git-push: fix placeholder formatting John Keeping
2016-07-26 20:44 ` [PATCH v3 2/3] push: add shorthand for --force-with-lease branch creation John Keeping
2016-07-26 20:44 ` [PATCH v3 3/3] push: allow pushing new branches with --force-with-lease John Keeping
2016-07-25 21:59 ` [PATCH v2 1/3] Documentation/git-push: fix placeholder formatting John Keeping
2016-07-25 21:59 ` [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation John Keeping
2016-07-25 22:22 ` Junio C Hamano
2016-07-26 8:03 ` John Keeping
2016-07-26 19:59 ` Junio C Hamano
2016-07-26 20:42 ` John Keeping
2016-07-26 21:19 ` Junio C Hamano
2016-07-26 10:30 ` Jakub Narębski
2016-07-26 11:19 ` John Keeping
2016-07-25 21:59 ` [PATCH v2 3/3] push: allow pushing new branches with --force-with-lease John Keeping
2016-07-25 22:11 ` [PATCH] " 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=xmqq4m7d7hlq.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
/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).