From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Antonio Ospite <ao2@ao2.it>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
git@vger.kernel.org, "Brandon Williams" <bmwill@google.com>,
"Daniel Graña" <dangra@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Richard Hartmann" <richih.mailinglist@gmail.com>,
"Stefan Beller" <sbeller@google.com>
Subject: Re: [RFC PATCH v2 03/12] t7411: be nicer to future tests and really clean things up
Date: Thu, 2 Aug 2018 18:40:42 +0200 [thread overview]
Message-ID: <20180802164042.28026-1-szeder.dev@gmail.com> (raw)
In-Reply-To: <20180802134634.10300-4-ao2@ao2.it>
> Tests 5 and 8 in t/t7411-submodule-config.sh add two commits with
> invalid lines in .gitmodules but then only the second commit is removed.
>
> This may affect future subsequent tests if they assume that the
> .gitmodules file has no errors.
>
> Since those commits are not needed anymore remove both of them.
>
> The modified line is in the last test of the file, so this does not
> change the current behavior, it only affects future tests.
>
> Signed-off-by: Antonio Ospite <ao2@ao2.it>
> ---
>
> Note that test_when_finished is not used here, both to keep the current style
> and also because it does not work in sub-shells.
That's true, but I think that this:
test_when_finished git -C super reset --hard HEAD~2
at the very beginning of the test should work.
> t/t7411-submodule-config.sh | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
> index 0bde5850ac..248da0bc4f 100755
> --- a/t/t7411-submodule-config.sh
> +++ b/t/t7411-submodule-config.sh
> @@ -135,7 +135,9 @@ test_expect_success 'error in history in fetchrecursesubmodule lets continue' '
> HEAD submodule \
> >actual &&
> test_cmp expect_error actual &&
> - git reset --hard HEAD^
> + # Remove both the commits which add errors to .gitmodules,
> + # the one from this test and the one from a previous test.
> + git reset --hard HEAD~2
> )
> '
>
> --
> 2.18.0
>
>
next prev parent reply other threads:[~2018-08-02 16:41 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 13:46 [RFC PATCH v2 00/12] Make submodules work if .gitmodules is not checked out Antonio Ospite
2018-08-02 13:46 ` [RFC PATCH v2 01/12] submodule: add a print_config_from_gitmodules() helper Antonio Ospite
2018-08-02 18:05 ` Stefan Beller
2018-08-09 10:17 ` Antonio Ospite
2018-08-02 13:46 ` [RFC PATCH v2 02/12] submodule: factor out a config_set_in_gitmodules_file_gently function Antonio Ospite
2018-08-02 13:46 ` [RFC PATCH v2 03/12] t7411: be nicer to future tests and really clean things up Antonio Ospite
2018-08-02 16:40 ` SZEDER Gábor [this message]
2018-08-02 18:15 ` Stefan Beller
2018-08-09 13:59 ` Antonio Ospite
2018-08-02 18:44 ` Junio C Hamano
2018-08-02 13:46 ` [RFC PATCH v2 04/12] submodule--helper: add a new 'config' subcommand Antonio Ospite
2018-08-02 18:47 ` Stefan Beller
2018-08-02 19:20 ` Jeff King
2018-08-03 10:21 ` Antonio Ospite
2018-08-02 13:46 ` [RFC PATCH v2 05/12] submodule: use the 'submodule--helper config' command Antonio Ospite
2018-08-02 18:59 ` Stefan Beller
2018-08-02 13:46 ` [RFC PATCH v2 06/12] submodule--helper: add a '--stage' option to the 'config' sub command Antonio Ospite
2018-08-02 18:57 ` Junio C Hamano
2018-08-03 11:03 ` Antonio Ospite
2018-08-03 16:24 ` Junio C Hamano
2018-08-06 10:58 ` Antonio Ospite
2018-08-06 17:38 ` Junio C Hamano
2018-08-07 9:19 ` Antonio Ospite
2018-08-06 18:19 ` Stefan Beller
2018-08-02 13:46 ` [RFC PATCH v2 07/12] submodule: use 'submodule--helper config --stage' to stage .gitmodules Antonio Ospite
2018-08-02 13:46 ` [RFC PATCH v2 08/12] t7506: cleanup .gitmodules properly before setting up new scenario Antonio Ospite
2018-08-02 19:11 ` Stefan Beller
2018-08-02 13:46 ` [RFC PATCH v2 09/12] submodule: support reading .gitmodules even when it's not checked out Antonio Ospite
2018-08-02 20:27 ` Stefan Beller
2018-08-02 13:46 ` [RFC PATCH v2 10/12] t7416: add new test about HEAD:.gitmodules and not existing .gitmodules Antonio Ospite
2018-08-02 20:43 ` Stefan Beller
2018-08-09 9:14 ` Antonio Ospite
2018-08-02 13:46 ` [RFC PATCH v2 11/12] dir: move is_empty_file() from builtin/am.c to dir.c and make it public Antonio Ospite
2018-08-02 20:50 ` Stefan Beller
2018-08-03 8:49 ` Antonio Ospite
2018-08-02 13:46 ` [RFC PATCH v2 12/12] submodule: remove the .gitmodules file when it is empty Antonio Ospite
2018-08-02 21:15 ` Stefan Beller
2018-08-03 8:57 ` Antonio Ospite
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=20180802164042.28026-1-szeder.dev@gmail.com \
--to=szeder.dev@gmail.com \
--cc=ao2@ao2.it \
--cc=bmwill@google.com \
--cc=dangra@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=richih.mailinglist@gmail.com \
--cc=sbeller@google.com \
/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).