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

2018-04-20 Thread Johannes Schindelin
Hi Martin, On Fri, 20 Apr 2018, Martin Ågren wrote: > Thanks a lot for your comments. I will give this some testing, check > that your proposed test fails and succeeds as it should, and so on, then > try to wrap this up. Thank you so much! > Between you cleaning up the test and providing a diff

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

2018-04-20 Thread Martin Ågren
Hi Johannes, On 20 April 2018 at 21:07, Johannes Schindelin wrote: > On Fri, 20 Apr 2018, Martin Ågren wrote: > >> Reintroduce the pattern of first grabbing the last object (using a new >> function `object_array_peek()`), then later poping it. Using >> `..._peek()` and `..._pop()` makes it clear

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

2018-04-20 Thread Johannes Schindelin
Hi Martin, On Fri, 20 Apr 2018, 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(&array)`. > > Unfortunately, one of the conversions

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

2018-04-20 Thread Isaac Chou
Subject: [PATCH] fast-export: fix regression skipping some merge-commits 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(&array)`. Unfortunately, one of

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

2018-04-20 Thread Martin Ågren
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(&array)`. Unfortunately, one of the conversions was horribly wrong. Between grabbing the last object (i.e., pee