From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 04 May 2015 19:24:57 GMT
Subject: Re: [PATCH 5/7] t5520: test --rebase with multiple branches
Message-ID: <xmqqmw1krvqu.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CAGZ79kbSMbhW2FLK05CaQjJjSTqEurB8iyeEBgyA1wbWJ4g2vw@mail.gmail.com>

Stefan Beller <sbeller@google.com> writes:

>> +test_expect_success '--rebase fails with multiple branches' '
>> +       git reset --hard before-rebase &&
>> +       test_must_fail git pull --rebase . copy master 2>out &&
>> +       test_when_finished "rm -f out" &&
>
> I think it would make sense to switch the previous 2 lines, because the
> test_when_finished should also be run if the test actually fails.

Excellent.  Thanks for carefully reading patches.