From: Junio C Hamano <gitster@pobox•com>
To: Stefan Beller <sbeller@google•com>
Cc: Paul Tan <pyokagan@gmail•com>,
"git\@vger.kernel.org" <git@vger•kernel.org>,
Johannes Schindelin <johannes.schindelin@gmx•de>
Subject: Re: [PATCH 5/7] t5520: test --rebase with multiple branches
Date: Mon, 04 May 2015 12:24:57 -0700 [thread overview]
Message-ID: <xmqqmw1krvqu.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAGZ79kbSMbhW2FLK05CaQjJjSTqEurB8iyeEBgyA1wbWJ4g2vw@mail.gmail.com> (Stefan Beller's message of "Mon, 4 May 2015 10:09:37 -0700")
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.
next prev parent reply other threads:[~2015-05-04 19:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-02 15:37 [PATCH 0/7] Improve git-pull test coverage Paul Tan
2015-05-02 15:37 ` [PATCH 1/7] t5520: test pulling multiple branches into an empty repository Paul Tan
2015-05-02 15:37 ` [PATCH 2/7] t5520: implement tests for no merge candidates cases Paul Tan
2015-05-04 8:04 ` Matthieu Moy
2015-05-06 6:04 ` Paul Tan
2015-05-06 6:06 ` Paul Tan
2015-05-02 15:37 ` [PATCH 3/7] t5520: test for failure if index has unresolved entries Paul Tan
2015-05-04 8:09 ` Matthieu Moy
2015-05-02 15:37 ` [PATCH 4/7] t5520: test work tree fast-forward when fetch updates head Paul Tan
2015-05-03 2:42 ` Eric Sunshine
2015-05-03 2:47 ` Paul Tan
2015-05-02 15:37 ` [PATCH 5/7] t5520: test --rebase with multiple branches Paul Tan
2015-05-04 17:09 ` Stefan Beller
2015-05-04 19:24 ` Junio C Hamano [this message]
2015-05-05 16:00 ` Paul Tan
2015-05-02 15:37 ` [PATCH 6/7] t5520: test --rebase failure on unborn branch with index Paul Tan
2015-05-02 15:37 ` [PATCH 7/7] t5521: test --dry-run does not make any changes Paul Tan
2015-05-04 8:16 ` [PATCH 0/7] Improve git-pull test coverage Matthieu Moy
2015-05-04 17:35 ` Junio C Hamano
2015-05-05 10:39 ` Paul Tan
2015-05-06 6:30 ` Paul Tan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmw1krvqu.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=pyokagan@gmail$(echo .)com \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox