From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Peter Kaestle <peter.kaestle@nokia.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git mailing list <git@vger.kernel.org>,
Stefan Beller <sbeller@google.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Philip Oakley <philipoakley@iee.email>
Subject: Re: [RFC 1/2] submodules: test for fetch of non-init subsub-repo
Date: Wed, 11 Nov 2020 14:24:46 -0500 [thread overview]
Message-ID: <48197610-9B5B-43A0-9748-AB71B061858A@gmail.com> (raw)
In-Reply-To: <1604910829-49109-2-git-send-email-peter.kaestle@nokia.com>
Hi Peter,
> Le 9 nov. 2020 à 03:33, Peter Kaestle <peter.kaestle@nokia.com> a écrit :
>
> --- snip ---
>
> +add_commit_push()
> +{
> + dir="$1"
> + msg="$2"
> + shift 2
> + git -C "$dir" add "$@" &&
> + git -C "$dir" commit -a -m "$msg" &&
> + git -C "$dir" push
> +}
> +
> +test_expect_failure 'fetching a superproject containing an uninitialized sub/sub project' '
> + # does not depend on any previous test setups
> +
> + for repo in outer middle inner
> + do
> + git init --bare $repo &&
> + git clone $repo ${repo}_content &&
> + echo $repo > ${repo}_content/file &&
> + add_commit_push ${repo}_content "initial" file
> + done &&
> +
> + git clone outer A &&
> + git -C A submodule add "$pwd/middle" &&
> + git -C A/middle/ submodule add "$pwd/inner" &&
> + add_commit_push A/middle/ "adding inner sub" .gitmodules inner &&
> + add_commit_push A/ "adding middle sub" .gitmodules middle &&
> +
> + git clone outer B &&
> + git -C B/ submodule update --init middle &&
> +
> + echo "change on inner repo of A" > A/middle/inner/file &&
> + add_commit_push A/middle/inner "change on inner" file &&
> + add_commit_push A/middle "change on inner" inner &&
> + add_commit_push A "change on inner" middle &&
In addition to what Junio wrote, maybe your test could make better use of the
functions provided by the test harness library. Take a look at t/README [1] for a
partial list, and t/test-lib-functions.sh [2] for the full list. test_create_repo, in particular,
could be useful.
Cheers,
Philippe.
[1] https://github.com/git/git/blob/master/t/README#L743
[2] https://github.com/git/git/blob/master/t/test-lib-functions.sh
next prev parent reply other threads:[~2020-11-11 19:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 14:23 [REGRESSION FIX 0/2] Handling regression introduced by a62387b Peter Kaestle
2020-11-03 14:23 ` [REGRESSION FIX 1/2] submodules: test for fetch of non-init subsub-repo Peter Kaestle
2020-11-03 14:23 ` [REGRESSION FIX 2/2] Revert "submodule.c: fetch in submodules git directory instead of in worktree" Peter Kaestle
2020-11-09 8:33 ` [RFC 0/2] Handling regression introduced by a62387b Peter Kaestle
2020-11-09 8:33 ` [RFC 1/2] submodules: test for fetch of non-init subsub-repo Peter Kaestle
2020-11-09 17:52 ` Junio C Hamano
2020-11-11 12:45 ` Peter Kästle
2020-11-11 17:22 ` Philip Oakley
2020-11-12 16:00 ` [RFCv2] submodules: fix of regression on fetching " Peter Kaestle
2020-11-11 17:35 ` [RFC 1/2] submodules: test for fetch " Philippe Blain
2020-11-11 19:27 ` Junio C Hamano
2020-11-11 19:24 ` Philippe Blain [this message]
2020-11-09 8:33 ` [RFC 2/2] Revert "submodule.c: fetch in submodules git directory instead of in worktree" Peter Kaestle
2020-11-10 15:08 ` Johannes Schindelin
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=48197610-9B5B-43A0-9748-AB71B061858A@gmail.com \
--to=levraiphilippeblain@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=peter.kaestle@nokia.com \
--cc=philipoakley@iee.email \
--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).