Re: merge: fix NULL pointer dereference when merging nothing into void

2016-03-21 Thread Eric Sunshine
On Mon, Mar 21, 2016 at 3:01 PM, Junio C Hamano wrote: > When we are on an unborn branch and merging only one foreign parent, > we allow "git merge" to fast-forward to that foreign parent commit. > > This codepath incorrectly attempted to dereference the list of > parents that the merge is going t

merge: fix NULL pointer dereference when merging nothing into void

2016-03-21 Thread Junio C Hamano
When we are on an unborn branch and merging only one foreign parent, we allow "git merge" to fast-forward to that foreign parent commit. This codepath incorrectly attempted to dereference the list of parents that the merge is going to record even when the list is empty. It must refuse to operate