[PATCH v2 0/3] push: allow pushing new branches with --force-with-lease
- From
John Keeping <john@keeping.me.uk>
- Date
- Jul 25, 2016, 21:59 UTC
- Message-ID
- <cover.1469483499.git.john@keeping.me.uk>
- In-Reply-To
- <xmqq4m7d7hlq.fsf@gitster.mtv.corp.google.com>
On Mon, Jul 25, 2016 at 10:28:01AM -0700, Junio C Hamano wrote:
Show 21 quoted lines
> 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.
Yes, that's nicer and it mirrors the syntax for deleting a remote branch.
I've pulled it out as a preparatory step because I like the fact that the "explicit" test passes even before the patch that is the main point of the series.
Show 7 quoted lines
> > +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 > > + ) &&
John Keeping (3): Documentation/git-push: fix placeholder formatting push: add shorthand for --force-with-lease branch creation push: allow pushing new branches with --force-with-lease
Documentation/git-push.txt | 5 +++-- remote.c | 9 +++++---- remote.h | 1 - t/t5533-push-cas.sh | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 7 deletions(-)
-- 2.9.2.639.g855ae9f