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

Re: [PATCH 0/3] t3404 incremental improvements

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 22, 2013, 19:02 UTC
Message-ID
<xmqqtxihr1kv.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CAPig+cRM_j7KOKG+YS1aTqz7suDY5LC7kh5-oP5H-GAenUqq-w@mail.gmail.com>
Eric Sunshine <sunshine@sunshineco.com> writes:
Show 15 quoted lines
> On Wed, Aug 21, 2013 at 7:25 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Eric Sunshine <sunshine@sunshineco.com> writes:
>>
>>> This set of patches was meant to be a re-roll of [1] addressing Junio's
>>> comments, however [1] graduated to 'next' before I found time to work on
>>> it further, so these are instead incremental patches atop 'next'.
>>
>> Just FYI, 'next' will be rewound once the upcoming release is done,
>> so we have a chance to rewind and squash.
>
> How would we go about this? Is there something I can do to streamline
> the squashing?
>
> Unfortunately, the various fix-up patches do not have a one-to-one
> correspondence to the original three patches in 'next'.

The most stream-lined way would be to send a replacement series early next week, by which time hopefully the 1.8.4 final is out; as long as the end-results of applying the series are the same, we know that the new code we will be using is the same as the code already in 'next' that people have been testing.

That way, there is no risk of me screwing up while trying to wiggle the existing patches and ending up with a split that do not match a logical progression of the series you would expect to see.

Previous: Eric Sunshine
Message 12 of 12 in “t3404 incremental improvements”
  1. 0/3 t3404 incremental improvementsEric Sunshine, Aug 21, 2013
  2. 1/3 t3404: preserve test_tick state across short SHA-1 collision testEric Sunshine, Aug 21, 2013
  3. Jonathan NiederAug 25, 2013
  4. Eric SunshineAug 25, 2013
  5. Jonathan NiederAug 25, 2013
  6. Junio C HamanoAug 26, 2013
  7. 2/3 t3404: make tests more self-containedEric Sunshine, Aug 21, 2013
  8. Junio C HamanoAug 21, 2013
  9. 3/3 t3404: simplify short SHA-1 collision testEric Sunshine, Aug 21, 2013
  10. Junio C HamanoAug 21, 2013
  11. Eric SunshineAug 22, 2013
  12. Junio C HamanoAug 22, 2013

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.