From: Junio C Hamano Date: Wed, 04 Sep 2013 17:19:00 GMT Subject: Re: [PATCH 4/4] t: branch: improve test rollback Message-ID: In-Reply-To: Felipe Contreras writes: > On Tue, Sep 3, 2013 at 5:59 PM, Junio C Hamano wrote: >> Felipe Contreras writes: >> >>> On Tue, Sep 3, 2013 at 2:32 PM, Junio C Hamano wrote: >>>> Felipe Contreras writes: >>> >>>>> test_expect_success 'refuse --edit-description on unborn branch for now' ' >>>>> + test_when_finished "git checkout -" && >>>> >>>> I am not sure if this is a good change. Depending on the outcome of >>>> the "git checkout" in the test (it may succeed and set @{-1} to the >>>> branch we were on when we entered the test, or it may fail and leave >>>> @{-1} to the branch before we were on when we entered the test), >>>> this will take us to a different place, no? >>> >>> It is better than leaving Git in an unborn branch. >> >> True, but it falls short of "After every test the environment should >> be as close as to how it was before as possible.", doesn't it? > > No it doesn't. Closer is closer. Closer is not "as close as ... possible". I think the fix is just to use the name of a concrete branch we want the next test to start on, instead of "-", which could be far quickly done than making excuses like that.