git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: What's cooking in git.git (Aug 2016, #01; Tue, 2)

From
Lars Schneider <larsxschneider@gmail.com>
Date
Aug 4, 2016, 08:03 UTC
Message-ID
<4877318E-3CBF-4C87-B24D-AAE35C427D66@gmail.com>
In-Reply-To
<xmqqlh0ebyhn.fsf@gitster.mtv.corp.google.com>
Show 13 quoted lines
> 
> * 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
Previous: Junio C HamanoNext: John Keeping
Message 4 of 8 in “What's cooking in git.git (Aug 2016, #01; Tue, 2)”
  1. Junio C HamanoAug 2, 2016
  2. Jakub NarębskiAug 3, 2016
  3. Junio C HamanoAug 3, 2016
  4. Lars SchneiderAug 4, 2016
  5. John KeepingAug 4, 2016
  6. Lars SchneiderAug 4, 2016
  7. Johannes SchindelinAug 4, 2016
  8. Junio C HamanoAug 4, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.