Re: [PATCH 2/2] rebase -i: fix SIGSEGV when 'merge ' fails

2018-08-27 Thread Johannes Schindelin
Hi, On Thu, 16 Aug 2018, Junio C Hamano wrote: > Phillip Wood writes: > > > This commit implements a minimal fix which fixes the crash and allows > > the user to successfully commit a conflict resolution with 'git rebase > > --continue'. It does not write .git/rebase-merge/patch, > >

Re: [PATCH 2/2] rebase -i: fix SIGSEGV when 'merge ' fails

2018-08-16 Thread Junio C Hamano
Phillip Wood writes: > This commit implements a minimal fix which fixes the crash and allows > the user to successfully commit a conflict resolution with 'git rebase > --continue'. It does not write .git/rebase-merge/patch, > .git/rebase-merge/stopped-sha or update REBASE_HEAD. I think that

Re: [PATCH 2/2] rebase -i: fix SIGSEGV when 'merge ' fails

2018-08-16 Thread Johannes Schindelin
Hi Phillip, On Wed, 15 Aug 2018, Phillip Wood wrote: > From: Phillip Wood > > If a merge command in the todo list specifies just a branch to merge > with no -C/-c argument then item->commit is NULL. This means that if > there are merge conflicts error_with_patch() is passed a NULL commit >

[PATCH 2/2] rebase -i: fix SIGSEGV when 'merge ' fails

2018-08-15 Thread Phillip Wood
From: Phillip Wood If a merge command in the todo list specifies just a branch to merge with no -C/-c argument then item->commit is NULL. This means that if there are merge conflicts error_with_patch() is passed a NULL commit which causes a segmentation fault when make_patch() tries to look it