Path: csiph.com!feeder.erje.net!2.eu.feeder.erje.net!news2.arglkargh.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Newsgroups: linux.debian.kernel
Subject: Re: Issues with using git debrebase for linux
Date: Fri, 17 Aug 2018 19:30:02 +0200
Message-ID: <wnQJs-2Tu-5@gated-at.bofh.it>
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>
X-Mailbox-Line: From debian-kernel-request@lists.debian.org  Fri Aug 17 17:22:12 2018
Old-Return-Path: <ijackson@chiark.greenend.org.uk>
X-Amavis-Spam-Status: No, score=-9.28 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, RCVD_IN_DNSWL_MED=-2.3] autolearn=ham autolearn_force=no
X-Policyd-Weight: using cached result; rate: -3.7
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Mailer: VM 8.2.0b under 24.4.1 (i586-pc-linux-gnu)
X-Mailing-List: <debian-kernel@lists.debian.org> archive/latest/117724
List-ID: <debian-kernel.lists.debian.org>
List-URL: <https://lists.debian.org/debian-kernel/>
List-Archive: https://lists.debian.org/msgid-search/23415.1073.13756.789400@chiark.greenend.org.uk
Approved: robomod@news.nic.it
Lines: 32
Organization: linux.* mail to news gateway
Sender: robomod@news.nic.it
X-Original-Cc: Sean Whitton  <spwhitton@spwhitton.name>, dgit@packages.debian.org, Debian kernel maintainers  <debian-kernel@lists.debian.org>
X-Original-Date: Fri, 17 Aug 2018 18:21:53 +0100
X-Original-Message-ID: <23415.1073.13756.789400@chiark.greenend.org.uk>
X-Original-References: <66ab847a0858d69b2fe6368a02136f081a144ca4.camel@decadent.org.uk> <874lft9elo.fsf@hephaestus.silentflame.com> <23414.61530.509478.507443@chiark.greenend.org.uk> <4e476c1de2c07106d68dd85369f91e035a583feb.camel@decadent.org.uk>
Xref: csiph.com linux.debian.kernel:61835

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.