Re: [PATCH] Fixing segmentation fault when merging FETCH_HEAD

2016-03-20 Thread Eric Sunshine
On Sun, Mar 20, 2016 at 8:11 PM, Jose Ivan B. Vilarouca Filho wrote: > Hello, Eric. > > Thanks for suggestions. I've added a test in commit replacing git fetch > origin by a fake FETCH_HEAD content. Thanks for the re-roll. To be "git am"-friendly, you should either place a "-- >8 --" scissor lin

Re: [PATCH] Fixing segmentation fault when merging FETCH_HEAD

2016-03-20 Thread Jose Ivan B. Vilarouca Filho
From: "Jose Ivan B. Vilarouca Filho" Hello, Eric. Thanks for suggestions. I've added a test in commit replacing git fetch origin by a fake FETCH_HEAD content. merge: don't dereference NULL pointer A segmentaion fault is raised when trying to merge FETCH_HEAD formed only by "not-for-merge" ref

Re: [PATCH] Fixing segmentation fault when merging FETCH_HEAD

2016-03-19 Thread Eric Sunshine
On Sat, Mar 19, 2016 at 2:17 PM, Jose Ivan B. Vilarouca Filho wrote: > From: "Jose Ivan B. Vilarouca Filho" You can drop this line since it is the same as the From: line in the email envelope. > Fixing segmentation fault when merging FETCH_HEAD Alternate: merge: don't dereference NULL poi

[PATCH] Fixing segmentation fault when merging FETCH_HEAD

2016-03-19 Thread Jose Ivan B. Vilarouca Filho
From: "Jose Ivan B. Vilarouca Filho" A segmentaion fault is raised when trying to merge FETCH_HEAD formed only by "not-for-merge" refs. Ex: git init . git remote add origin ... git fetch origin git merge FETCH_HEAD Signed-off-by: Jose Ivan B. Vilarouca Filho --- builtin/merge.