RE: [BUG] Git fast-export with import marks file omits merge commits

To: Junio C Hamano <gits...@pobox.com> Cc: Isaac Chou <isaac.c...@microfocus.com>; Johannes Schindelin <johannes.schinde...@gmx.de>; Jonathan Tan <jonathanta...@google.com>; git@vger.kernel.org Subject: Re: [BUG] Git fast-export with import marks file omits merge commits O

Re: [BUG] Git fast-export with import marks file omits merge commits

On 20 April 2018 at 00:48, Junio C Hamano wrote: > Isaac Chou writes: > >> I inspected the source code (builtin/fast-export.c) for the >> fast-export issue I encountered, and it looks like the merge >> commit is discarded too early by the call to

Re: [BUG] Git fast-export with import marks file omits merge commits

Isaac Chou writes: > I inspected the source code (builtin/fast-export.c) for the > fast-export issue I encountered, and it looks like the merge > commit is discarded too early by the call to object_array_pop() > after only one of the two UNSHOWN parents is processed in

Re: [BUG] Git fast-export with import marks file omits merge commits

Hi Isaac, On Thu, Apr 19, 2018 at 2:46 PM, Isaac Chou wrote: > I inspected the source code (builtin/fast-export.c) for the fast-export issue > I encountered, and it looks like the merge commit is discarded too early by > the call to object_array_pop() after only one

RE: [BUG] Git fast-export with import marks file omits merge commits

I inspected the source code (builtin/fast-export.c) for the fast-export issue I encountered, and it looks like the merge commit is discarded too early by the call to object_array_pop() after only one of the two UNSHOWN parents is processed in the method handle_tail(). The poped merge commit