Hi Elijah, On Fri, 5 Jan 2018, Elijah Newren wrote: > t3501 had a testcase originally added in 05f2dfb965 (cherry-pick: > demonstrate a segmentation fault, 2016-11-26) to ensure cherry-pick > wouldn't segfault when working with a dirty file involved in a rename. > > While the segfault was fixed, there was another problem this test > demonstrated: namely, that git would overwrite a dirty file involved in a > rename. Further, the test encoded a "successful merge" and overwriting of > this file as correct behavior. Whoops. Sorry about that. Thanks for the patch, looks obviously good (I haven't read 3/3 yet, but figure that the error message stems from the changes introduced in that patch). Ciao, Dscho
