On Fri, 2018-08-17 at 16:57 +0100, Ian Jackson wrote: [...] > Ben: as I said earlier, I think you just need a new version of your > strip-a-patch script. It would run something like this: > > export MY_STRIP_A_PATCH_RUNNING_AS_EDITOR=1 > export EDITOR=my-strip-a-patch-script > unset VISUAL > git-debrebase -i I've been setting GIT_EDITOR, which appears to take precedence over both EDITOR and VISUAL. > git-debrebase would invoke git-rebase which would reinvoke your > script, thinking it's the editor. Your script gets the git-rebase > todo list. Your script just has to find the git-rebase todo list item > corresponding to the commit to be replaced (`pick <old commitid>'), > and change it to say `pick <commitid for new version of patch>' > or maybe `exec git-am <some file>'. I didn't try to match up commits exactly, but dropped all the existing commits that have a specific "Bug-Debian: ..." pseudo-header. I added the new commits at the end of the series. I'm satisifed that this works well enough. Ben. -- Ben Hutchings It is impossible to make anything foolproof because fools are so ingenious.
Attachment:
signature.asc
Description: This is a digitally signed message part