From: Stefan Sperling Subject: Re: got backout: segfault To: Tracey Emery Cc: Sebastien Marie , gameoftrees@openbsd.org Date: Sun, 9 Feb 2020 11:58:21 +0100 On Fri, Feb 07, 2020 at 02:07:21PM -0700, Tracey Emery wrote: > On Fri, Feb 07, 2020 at 10:03:31PM +0100, Stefan Sperling wrote: > > On Fri, Feb 07, 2020 at 01:51:52PM -0700, Tracey Emery wrote: > > > LOL, I think I was just being blind or thick or something (thick). It > > > looks like the wrong path is being sent. Based on this output from the > > > diff below, is this the desired result? If so, should a test be added? > > > > Yes this fix looks good, and a test would be great :) > > > > Thank you! > > > > I pushed this diff to get the segfault fixed, but won't have time for > building the test until later. > > Thanks! Tests have been updated. Test case "test_backout_next_commit" in backout.sh covers this bug. I am not sure what semarie was trying to achieve by reverse-merging a commit from the future, but at least we don't crash anymore :-)