[0/2] Fix merge restore state

Message

Jean-Noël Avila via GitGitGadget May 19, 2022, 4:26 p.m. UTC

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/[e-mail]/

Elijah Newren (2):
  merge: remove unused variable
  merge: make restore_state() do as its name says

 builtin/merge.c        | 12 ++++++------
 t/t7607-merge-state.sh | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100755 t/t7607-merge-state.sh


base-commit: 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1e
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1231%2Fnewren%2Ffix-merge-restore-state-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1231/newren/fix-merge-restore-state-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1231

Comments

Elijah Newren June 12, 2022, 6:58 a.m. UTC | #1

On Thu, May 19, 2022 at 9:26 AM Elijah Newren via GitGitGadget
<[e-mail]> 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/[e-mail]/

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).

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.)

ZheNing Hu June 12, 2022, 8:54 a.m. UTC | #2

Elijah Newren <[e-mail]> 于2022年6月12日周日 14:58写道：
>
> On Thu, May 19, 2022 at 9:26 AM Elijah Newren via GitGitGadget
> <[e-mail]> 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/[e-mail]/
>
> 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