Re: Issues with using git debrebase for linux

From	Ian Jackson <ijackson@chiark.greenend.org.uk>
Newsgroups	linux.debian.kernel
Subject	Re: Issues with using git debrebase for linux
Date	2018-08-17 19:30 +0200
Message-ID	<wnQJs-2Tu-5@gated-at.bofh.it> (permalink)
References	<wlOLL-4tm-3@gated-at.bofh.it> <wnPkl-1Wu-1@gated-at.bofh.it> <wnPkl-1Wu-3@gated-at.bofh.it> <wnQq5-2Ng-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Ben Hutchings writes ("Re: Issues with using git debrebase for linux"):
> I've been setting GIT_EDITOR, which appears to take precedence over
> both EDITOR and VISUAL.

You have implicitly pointed out a bug in my test suite.  I need to
unset GIT_EDITOR as well as 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.

That sounds reasonable.

I'm afraid I have several other fires to put out first so the faster
git-debrebase won't be in sid right away, and of course there's still
that failure to record ffq-prev bug.

Ian.

-- 
Ian Jackson <ijackson@chiark.greenend.org.uk>   These opinions are my own.

If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.

Thread

Issues with using git debrebase for linux Ben Hutchings <ben@decadent.org.uk> - 2018-08-12 05:00 +0200
  Re: Issues with using git debrebase for linux Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-08-12 18:20 +0200
    Re: Issues with using git debrebase for linux Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-08-12 19:30 +0200
      Re: Issues with using git debrebase for linux Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-08-12 20:20 +0200
        Re: Issues with using git debrebase for linux Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-08-12 23:50 +0200
  Bug#905975: Issues with using git debrebase for linux Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-08-12 19:30 +0200
  Re: Issues with using git debrebase for linux Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-08-17 18:00 +0200
    Re: Issues with using git debrebase for linux Sean Whitton <spwhitton@spwhitton.name> - 2018-08-17 18:20 +0200
    Re: Issues with using git debrebase for linux Ben Hutchings <ben@decadent.org.uk> - 2018-08-17 19:10 +0200
      Re: Issues with using git debrebase for linux Ian Jackson <ijackson@chiark.greenend.org.uk> - 2018-08-17 19:30 +0200
  Re: Issues with using git debrebase for linux Sean Whitton <spwhitton@spwhitton.name> - 2018-08-17 18:00 +0200

csiph-web