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

2018-04-20 Thread Isaac Chou
AM To: Junio C Hamano Cc: Isaac Chou ; Johannes Schindelin ; Jonathan Tan ; git@vger.kernel.org Subject: 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 (buil

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

2018-04-19 Thread Martin Ågren
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 object_array_pop() >> after only one of the two UN

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

2018-04-19 Thread Junio C Hamano
-Original Message- > From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On Behalf > Of Isaac Chou > Sent: Monday, April 16, 2018 3:58 PM > To: git@vger.kernel.org > Subject: Git fast-export with import marks file omits merge commits > > Hello, > &g

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

2018-04-19 Thread Elijah Newren
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 of the two UNSHOWN parents i

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

2018-04-19 Thread Isaac Chou
...@vger.kernel.org] On Behalf Of Isaac Chou Sent: Monday, April 16, 2018 3:58 PM To: git@vger.kernel.org Subject: Git fast-export with import marks file omits merge commits Hello, I came across a change of behavior with Git version 2.15 and later where the fast-export command would omit the merge commits

Git fast-export with import marks file omits merge commits

2018-04-16 Thread Isaac Chou
Hello, I came across a change of behavior with Git version 2.15 and later where the fast-export command would omit the merge commits.  The same use case works correctly with Git version 2.14 and older.  Here is the detail of the use case: 0> git --version git version 2.16.2.windows.1 1> git in