From: Lars Schneider <larsxschneider@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, john@keeping.me.uk
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)
Date: Thu, 4 Aug 2016 10:03:39 +0200 [thread overview]
Message-ID: <4877318E-3CBF-4C87-B24D-AAE35C427D66@gmail.com> (raw)
In-Reply-To: <xmqqlh0ebyhn.fsf@gitster.mtv.corp.google.com>
>
> * jk/push-force-with-lease-creation (2016-07-26) 3 commits
> - push: allow pushing new branches with --force-with-lease
> - push: add shorthand for --force-with-lease branch creation
> - Documentation/git-push: fix placeholder formatting
>
> "git push --force-with-lease" already had enough logic to allow
> ensuring that such a push results in creation of a ref (i.e. the
> receiving end did not have another push from sideways that would be
> discarded by our force-pushing), but didn't expose this possibility
> to the users. It does so now.
>
> Will merge to 'next'.
t5533-push-cas.sh "16 - new branch already exists" seems to be broken
for OSX on next. Git bisect indicates that "push: add shorthand for
--force-with-lease branch creation" might be the culprit.
https://travis-ci.org/git/git/jobs/149614431
https://api.travis-ci.org/jobs/149614431/log.txt?deansi=true (non-JS)
- Lars
next prev parent reply other threads:[~2016-08-04 8:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-02 22:24 What's cooking in git.git (Aug 2016, #01; Tue, 2) Junio C Hamano
2016-08-03 12:24 ` Jakub Narębski
2016-08-03 15:29 ` Junio C Hamano
2016-08-04 8:03 ` Lars Schneider [this message]
2016-08-04 11:32 ` John Keeping
2016-08-04 14:00 ` Lars Schneider
2016-08-04 14:53 ` Johannes Schindelin
2016-08-04 16:02 ` 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=4877318E-3CBF-4C87-B24D-AAE35C427D66@gmail.com \
--to=larsxschneider@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).