Re: [PATCH v3] fast-export: fix regression skipping some merge-commits

On Fri, Jun 1, 2018 at 9:41 PM, Isaac Chou wrote: > Hello, I need help on this topic again. I need to inform our customers what > release this issue will be addressed in. I checked the 2.17.1 binary release > recently and found that the fix is not included. Can someone help me with > that

RE: [PATCH v3] fast-export: fix regression skipping some merge-commits

to determine it myself? Thanks, Isaac -Original Message- From: Martin Ågren [mailto:martin.ag...@gmail.com] Sent: Saturday, April 21, 2018 3:00 AM To: Junio C Hamano Cc: Git Mailing List ; Johannes Schindelin ; Isaac Chou ; Jonathan Tan Subject: Re: [PATCH v3] fast-export: fix regression

Re: [PATCH v3] fast-export: fix regression skipping some merge-commits

On 21 April 2018 at 05:43, Junio C Hamano wrote: > but I do not think the updated "fix" below is better. It might be > just aesthetics and I suspect I won't find it as disturbing if we > could push with > > object_array_push(commits, (struct object *)commit); > > or

Re: [PATCH v3] fast-export: fix regression skipping some merge-commits

On 21 April 2018 at 00:16, Eric Sunshine wrote: > On Fri, Apr 20, 2018 at 6:12 PM, Martin Ågren wrote: >> Re-add a commit when it is not yet time to handle it. An alternative >> that was considered was to peek-then-pop. That carries some risk with

Re: [PATCH v3] fast-export: fix regression skipping some merge-commits

Martin Ågren writes: > +test_expect_success 'merge commit gets exported with --import-marks' ' > + test_create_repo merging && > + ( > + cd merging && > + test_commit initial && > + git checkout -b topic && > +

Re: [PATCH v3] fast-export: fix regression skipping some merge-commits

On Fri, Apr 20, 2018 at 6:12 PM, Martin Ågren wrote: > 7199203937 (object_array: add and use `object_array_pop()`, 2017-09-23) > noted that the pattern `object = array.objects[--array.nr].item` could > be abstracted as `object = object_array_pop()`. > > Unfortunately, one