On Mon, Jul 18, 2011 at 5:40 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> +test_expect_failure 'git detects conflict and handles merge of D & E1 correctly' ' >> + git reset --hard && >> + git reset --hard && >> + git clean -fdqx && >> + git checkout D^0 && > > Why do you need to reset twice? Superstition (you have a commented one > introduced later in the series --- perhaps this shows a bug in reset)? I could have sworn that when I first created these tests last September that the double reset was needed to get back to a clean state. I can't seem to duplicate the issue now, though I do see some "error" messages printed on the first reset despite the reset working successfully. I'll drop the extra one. *shrug* [I'm not ignoring the many other good comments you made on this patch; they just got incorporated into code and comment changes for the next version of the series I send out.] -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html