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

Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 22, 2018, 16:48 UTC
Message-ID
<xmqq8takm4y4.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<1f7194bb-f48b-e229-94ae-44c58636172f@talktalk.net>
Phillip Wood <phillip.wood@talktalk.net> writes:
Show 13 quoted lines
> On 20/03/18 19:32, Junio C Hamano wrote:
>
>> With or without the above plan, what we saw from you were a bit
>> messy to queue.  The --keep-empty fix series is based on 'maint',
>> while the --signoff series depends on changes that happened to
>> sequencer between 'maint' and 'master', but yet depends on the
>> former.
>
> Yes, that is awkward and unfortunate but the idea behind splitting them
> into two separate series was to have a single set of bug fixes in the
> history. The feature needed to be based on master, so if I'd had the bug
> fixes in the same series you'd of had to cherry-pick them to maint which
> would break branch/tag --contains. I'm not sure if that is a better option.

I said "a bit messy" but that was a statement of a fact, not a complaint. Sometimes, we cannot avoid that necessary solutions to real-life problems must be messy.

I still think what you sent was the best organization, given the constraints ;-).

Thanks.
Previous: Phillip Wood
Message 9 of 9 in “rebase --recreate-merges --keep-empty: don't prune empty”
  1. 0/2 rebase --recreate-merges --keep-empty: don't prune emptyPhillip Wood, Mar 20, 2018
  2. 2/2 rebase --recreate-merges --keep-empty: don't prune empty commitsPhillip Wood, Mar 20, 2018
  3. Johannes SchindelinMar 20, 2018
  4. 1/2 add failing test for rebase --recreate-merges --keep-emptyPhillip Wood, Mar 20, 2018
  5. Johannes SchindelinMar 20, 2018
  6. Phillip WoodMar 20, 2018
  7. Junio C HamanoMar 20, 2018
  8. Phillip WoodMar 22, 2018
  9. Junio C HamanoMar 22, 2018

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.