From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] t3419: prevent failure when run with EXPENSIVE
Date: Fri, 20 Mar 2020 15:24:20 -0700 [thread overview]
Message-ID: <xmqqeetmbr6z.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CABPp-BGiP7eG7Ojt8FKV5PUBFk74pkO6jnOwJEZbDzBjdJUm5w@mail.gmail.com> (Elijah Newren's message of "Fri, 20 Mar 2020 14:44:41 -0700")
Elijah Newren <newren@gmail.com> writes:
>> - rm -rf .git/rebase-apply
>> + rm -rf .git/rebase-merge .git/rebase-apply
>> '
>> }
>
> Good catch, thanks. Perhaps we just want to invoke 'git rebase
> --quit' and let it clean up instead of manually doing so ourselves,
> since it may buy us some future-proofing in case we ever want to move
> the place we store rebase state?
I started writing "I would agree 100% if this script were not about
testing 'rebase', but using 'rebase' itself for a framework to test
'rebase'???" but then if 'rebase --quit' fails to clear these, what
we are likely to see is that the next test to fail, so it probably
is an OK approach.
Thanks.
next prev parent reply other threads:[~2020-03-20 22:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-20 21:39 [PATCH] t3419: prevent failure when run with EXPENSIVE brian m. carlson
2020-03-20 21:44 ` Elijah Newren
2020-03-20 21:49 ` brian m. carlson
2020-03-20 22:24 ` Junio C Hamano [this message]
2020-03-20 21:52 ` [PATCH v2] " brian m. carlson
2020-03-22 7:51 ` [PATCH] t3419: drop EXPENSIVE tests Jeff King
2020-03-22 17:11 ` brian m. carlson
2020-03-22 19:19 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqeetmbr6z.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).