Re: [PATCH v19 00/20] Reftable support git-core
- From
Han-Wen Nienhuys <hanwen@google.com>
- Date
- Jun 30, 2020, 09:28 UTC
- Message-ID
- <CAFQ2z_MbiTEzztU9a8beMAQFn1-ozBUwKD1JyhXHUnoTTto0TA@mail.gmail.com>
- In-Reply-To
- <xmqqimf9fppn.fsf@gitster.c.googlers.com>
On Tue, Jun 30, 2020 at 12:54 AM Junio C Hamano <gitster@pobox.com> wrote:
Show 15 quoted lines
> > "Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com> writes: > > > base-commit: b9a2d1a0207fb9ded3fa524f54db3bc322a12cc4 > > This is based on 'next', which usually is a sure way for a topic to > stay forever out of 'next', but we have impactful dependence only on > two topics, I think, and a good news is that both of them are in > pretty good shape. I think Brian's part 2 of SHA-256 work should be > on the 'master' branch soon, and Dscho's "customizable default > branch" is also ready---it just would, like all other topics, want > to spend at least one week on 'next' to be safe. And after that, > this topic can be directly on 'master' (there is another trivial > conflict around bisect--helper, but I am not worried about it), > which looks quite good.
ok. For the next time, I should keep basing myself on master, even if I know there are conflicts?
Do you have an opinion on https://public-inbox.org/git/pull.665.git.1592580071.gitgitgadget@gmail.com/ ?
There is some overlap with in sequencer.c, and Phillip's approach is likely more principled, so I'd like to base reftable on that.
> fixup! Reftable support for git-core
thanks, folded in!
-- Han-Wen Nienhuys - Google Munich I work 80%. Don't expect answers from me on Fridays. -- Google Germany GmbH, Erika-Mann-Strasse 33, 80636 Munich Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Paul Manicle, Halimah DeLaine Prado