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

Re: [RFC] Stgit - patch history / add extra parents

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Aug 31, 2005, 09:27 UTC
Message-ID
<tnxaciyo3qh.fsf@arm.com>
In-Reply-To
<Pine.LNX.4.63.0508231731370.23242@iabervon.org>
Daniel Barkalow <barkalow@iabervon.org> wrote:
Show 21 quoted lines
> On Tue, 23 Aug 2005, Jan Veldeman wrote:
>> The parents which should be visible to the outside, will always be versions
>> of my development tree, which I have previously pushed out. My way of
>> working would become:
>> * make changes, all over the place, using stgit
>> * still make changes (none of these gets tracked, intermittent versions are
>>   lost)
>> * having a good day: changes looks good, I want to push this out:
>>   * push my tree out
>>   * stgit-free (which makes the pushed out commits, the new parents of my
>>     stgit patches)
>> * restart from top
>
> I'm not sure how applicable to this situation stgit really is; I see stgit
> as optimized for the case of a patch set which is basically done, where
> you want to keep it applicable to the mainline as the mainline advances.
>
> For your application, I'd just have a git branch full of various stuff,
> and then generate clean commits by branching mainline, diffing development
> against it, cutting the diff down to just what I want to push, and
> applying that. Then the clean patch goes into stgit.

StGIT has the 'refresh' command which allows a patch to be indefinitely modified (that's pretty much how I use StGIT). I use it for the case where I would like to keep the changes in separate logical entities (patches) but they are not independent enough to create separate branches.

Take for example a new platform port, you can have some of the existing code re-worked in a patch, some CPU support in the next patch, basic platform support in another patch, some device drivers specific to this platform in yet another patch. Subsequent patches are dependent on the previous ones. Branching from the mainline for each of these features might not make sense and keeping all of them in the same branch can make maintenance a bit more difficult.

-- 
Catalin
Previous: Daniel BarkalowNext: Catalin Marinas
Message 15 of 22 in “[RFC] Stgit - patch history / add extra parents”
  1. Jan VeldemanAug 18, 2005
  2. Catalin MarinasAug 19, 2005
  3. Jan VeldemanAug 19, 2005
  4. Catalin MarinasAug 19, 2005
  5. Jan VeldemanAug 19, 2005
  6. Catalin MarinasAug 20, 2005
  7. Jan VeldemanAug 21, 2005
  8. Daniel BarkalowAug 22, 2005
  9. Catalin MarinasAug 23, 2005
  10. Daniel BarkalowAug 23, 2005
  11. Jan VeldemanAug 23, 2005
  12. Daniel BarkalowAug 23, 2005
  13. Jan VeldemanAug 25, 2005
  14. Daniel BarkalowAug 25, 2005
  15. Catalin MarinasAug 31, 2005
  16. Catalin MarinasAug 31, 2005
  17. Catalin MarinasAug 30, 2005
  18. Jan VeldemanAug 31, 2005
  19. Daniel BarkalowAug 31, 2005
  20. Junio C HamanoAug 24, 2005
  21. Linus TorvaldsAug 24, 2005
  22. Junio C HamanoAug 23, 2005

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.