Re: [BUG] Git fast-export with import marks file omits merge commits
- From
Elijah Newren <newren@gmail.com>
- Date
- Apr 19, 2018, 22:26 UTC
- Message-ID
- <CABPp-BHv=jZZfbZnfSt81oxJ0QAxJp7W2rOsfFq6ThVEYK5z7Q@mail.gmail.com>
- In-Reply-To
- <MW2PR18MB2284E3091991A3DB228CEBBEE5B50@MW2PR18MB2284.namprd18.prod.outlook.com>
Hi Isaac,
On Thu, Apr 19, 2018 at 2:46 PM, Isaac Chou <Isaac.Chou@microfocus.com> 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 is processed in the method handle_tail(). The poped merge commit still has one UNSHOWN parent, therefore it is not processed and is lost in the output. Can someone advise me on how to submit a code change or bug report in order to get the fix into the code base?
Careful now, fast-export was also the location of my first patch. It's easy to get addicted to contributing changes to git. :-)
Inside the git.git repository, there are two files that explain the basic process -- Documentation/SubmittingPatches and Documentation/CodingGuidelines. If they don't cover the process well, that's probably a bug itself, but feel free to ask on the list if you still run into questions. Those documents can be slighly overwhelming at first glance, but they've got good information.
Elijah