Re: b4 submit ready for beta testing

["Theodore Ts'o" <tytso@mit.edu>]

On Wed, Jul 20, 2022 at 09:02:56PM -0300, Jason Gunthorpe wrote:
> 
> I'm getting the impression that people are building series in git
> without using a lot of 'rebase -i' ? How is this done ?

There are lots of different mechanisms.  Some of them are syntactic
sugar on top of git rebase and/or git cherry-pick.  For example, there
is "Stacked Git"[1].

I used to use "guilt"[2], which I liked because it stored the patch
series as a quilt patch series, but when you used commands like "guilt
push" it would apply the patch to the current git branch, and "guilt
pop" would remove the patch from git branch (i.e., the moral
equivalent of "git reset --hard HEAD^").  You could then edit the
current using "git commit --amend" and then "guilt refresh" would
update the quilt series to reflect the changes made with "git commit
--amend".

The reason why I liked guilt is that since the source of truth was a
quilt patch series directory, I could keep the quilt patch series
under checked into a git repo, and so I could easily look at a
previous version of the patch series if I screwed up.  Rebasing to a
newer baseline was also pretty easy --- "guilt pop -a; git pull .... ;
guilt push -a".

Alas, "guilt" is now unmaintained, and I've gotten a lot matter at
using "git rebase -i" and tagging different versions of the patch
series.  But there are certainly a large number tools for different
developer's work flow.

[1] https://stacked-git.github.io/
[2] https://github.com/jeffpc/guilt

					- Ted