From: Julian Phillips Date: Tue, 11 Oct 2011 08:09:58 GMT Subject: Re: [PATCH v2 0/7] Provide API to invalidate refs cache Message-ID: <42eba56f4da8f642e806a667bfa22884@quantumfyre.co.uk> In-Reply-To: <4E93D932.6020001@alum.mit.edu> On Tue, 11 Oct 2011 07:50:42 +0200, Michael Haggerty wrote: > And this rebase will be work with no benefit, because my series > includes > all of the improvements of jp/get-ref-dir-unsorted plus much more. > But > my change to the data structure is implemented in a different order > and > following other improvements. For example, I add a lot of comments, > change a lot of code to use the cached_refs data structure more > consistently, and accommodate partly-sorted lists by the time my > patch > series includes everything that is in jp/get-ref-dir-unsorted. > > Rebasing 78 patches is going to be a morass of clerical work. Is > there > any alternative? If you create a new commit that reverts the problematic changes to refs.c with some suitable message about doing the same thing more piecemeal as the first change of a new series, and rebase your changes on top, you should be able to create a 79 patch series with little work. Dunno if that would acceptable for merging? -- Julian