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

Re: [PATCH v5 0/6] Reject non-ff pulls by default

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 30, 2014, 19:52 UTC
Message-ID
<xmqqppjyegsw.fsf@gitster.dls.corp.google.com>
In-Reply-To
<53614d8c23d6_2aa5fa32f06@nysa.notmuch>
Felipe Contreras <felipe.contreras@gmail.com> writes:
Show 14 quoted lines
> Junio C Hamano wrote:
>> Felipe Contreras <felipe.contreras@gmail.com> writes:
>> ...
>> > This plan, however, fell off the cliff.
>> 
>> Yeah, I see that $gmane/234488 explains why the second step in the
>> previous one stopped.  I guess it was in expecting a reroll state,
>> waiting for that other topic (I do not remember offhand) to
>> graduate.
>> 
>> I see nothing touching the affected codepaths now, so this time
>> around we may have a better chance, perhaps?
>
> A chance of what?
A chance not to have the plan "fell off the cliff".
> Do you want me to reroll to include the future
> backwards-incompatible change warning?

Yes, as I said in the other thread ($gmane/247758), if you do not have that step yet (I haven't looked at the implementation while discussing the design in this thread and looking at patches in other topics) I'd strongly recommend adding one.

> Should I include the patch that turns the switch?
Sorry, but you lost me here.  Turns what switch to what value?
Previous: Felipe ContrerasNext: Junio C Hamano
Message 18 of 19 in “Reject non-ff pulls by default”
  1. 0/6 Reject non-ff pulls by defaultFelipe Contreras, Apr 29, 2014
  2. 1/6 pull: rename pull.rename to pull.modeFelipe Contreras, Apr 29, 2014
  3. Marat RadchenkoApr 29, 2014
  4. Felipe ContrerasApr 29, 2014
  5. Philip OakleyApr 29, 2014
  6. Felipe ContrerasApr 29, 2014
  7. Philip OakleyApr 29, 2014
  8. Richard HansenApr 30, 2014
  9. 2/6 pull: migrate all the tests to pull.modeFelipe Contreras, Apr 29, 2014
  10. 3/6 pull: refactor $rebase variable into $modeFelipe Contreras, Apr 29, 2014
  11. 4/6 pull: add --merge optionFelipe Contreras, Apr 29, 2014
  12. 5/6 pull: add merge-ff-only optionFelipe Contreras, Apr 29, 2014
  13. 6/6 pull: only allow ff merges by defaultFelipe Contreras, Apr 29, 2014
  14. Junio C HamanoApr 30, 2014
  15. Felipe ContrerasApr 30, 2014
  16. Junio C HamanoApr 30, 2014
  17. Felipe ContrerasApr 30, 2014
  18. Junio C HamanoApr 30, 2014
  19. Junio C HamanoApr 30, 2014

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.