Elijah Newren <newren@xxxxxxxxx> 于2022年6月12日周日 14:58写道： > > On Thu, May 19, 2022 at 9:26 AM Elijah Newren via GitGitGadget > <gitgitgadget@xxxxxxxxx> wrote: > > > > A simple series to fix restore_state() in builtin/merge.c, fixing the issue > > reported by ZheNing Hu over here: > > https://lore.kernel.org/git/CAOLTT8R7QmpvaFPTRs3xTpxr7eiuxF-ZWtvUUSC0-JOo9Y+SqA@xxxxxxxxxxxxxx/ > > I updated this series a few weeks ago, I believe addressing all the > feedback. But I hesitated to type "/submit" over at > https://github.com/gitgitgadget/git/pull/1231. I've done virtually no > development on "interesting" (to me) projects for quite some time; I'm > only responding to email questions and review requests on the list. > And the review process takes quite a bit of work at times, and on the > chance there was more feedback to address, I just didn't have it in me > to submit a new round even though it _might_ be complete and certainly > fixes some known issues. I haven't even gotten to review Dscho's > updates of my patches this whole week (spent the time I had mostly on > the merge-ort issue reported). > Sorry for missing this patch before. I have tried this patch, which can perfectly solve my origin problem. Now it can reset to origin state (Even when there are some files in the work-tree here that have changed) > Does anyone else want to take this topic over? There are updated > patches and even an updated cover letter over at > https://github.com/gitgitgadget/git/pull/1231. It might involve > nothing more than submitting those patches; they might be good enough > already. (Alternatively, I can type "/submit" to send them in...if > someone else agrees to respond to any feedback.) Yes, I think you can submit it, thanks very much! -- ZheNing Hu
