From: Brandon Williams <bmwill@google.com>
To: Stefan Beller <sbeller@google.com>
Cc: jrnieder@gmail.com, git@vger.kernel.org, gitster@pobox.com,
Jens.Lehmann@web.de, hvoigt@hvoigt.net
Subject: Re: [PATCH 3/3] submodule--helper: add intern-git-dir function
Date: Mon, 21 Nov 2016 13:56:21 -0800 [thread overview]
Message-ID: <20161121215621.GB149321@google.com> (raw)
In-Reply-To: <20161121204146.13665-4-sbeller@google.com>
On 11/21, Stefan Beller wrote:
> diff --git a/t/t7412-submodule-interngitdirs.sh b/t/t7412-submodule-interngitdirs.sh
> new file mode 100755
> index 0000000000..8938a4c8b7
> --- /dev/null
> +++ b/t/t7412-submodule-interngitdirs.sh
> @@ -0,0 +1,41 @@
> +#!/bin/sh
> +
> +test_description='Test submodule interngitdirs
> +
> +This test verifies that `git submodue interngitdirs` moves a submodules git
> +directory into the superproject.
> +'
> +
> +. ./test-lib.sh
> +
> +test_expect_success 'setup a real submodule' '
> + git init sub1 &&
> + test_commit -C sub1 first &&
> + git submodule add ./sub1 &&
> + test_tick &&
> + git commit -m superproject
> +'
> +
> +test_expect_success 'intern the git dir' '
> + git submodule interngitdirs &&
> + test -f sub1/.git &&
> + test -d .git/modules/sub1 &&
> + # check that we did not break the repository:
> + git status
> +'
> +
> +test_expect_success 'setup a gitlink with missing .gitmodules entry' '
> + git init sub2 &&
> + test_commit -C sub2 first &&
> + git add sub2 &&
> + git commit -m superproject
> +'
> +
> +test_expect_success 'intern the git dir fails for incomplete submodules' '
> + test_must_fail git submodule interngitdirs &&
> + # check that we did not break the repository:
> + git status
> +'
> +
> +test_done
> +
Could we add a test which has nested submodules that need to be
migrated? Hopfully its just as easy as adding the test :)
--
Brandon Williams
next prev parent reply other threads:[~2016-11-21 21:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-21 20:41 [PATCH 0/3] Introduce `submodule interngitdirs` Stefan Beller
2016-11-21 20:41 ` [PATCH 1/3] submodule: use absolute path for computing relative path connecting Stefan Beller
2016-11-21 21:01 ` Junio C Hamano
2016-11-21 21:03 ` Stefan Beller
2016-11-22 0:04 ` Stefan Beller
2016-11-22 7:02 ` Junio C Hamano
2016-11-21 20:41 ` [PATCH 2/3] test-lib-functions.sh: teach test_commit -C <dir> Stefan Beller
2016-11-21 21:04 ` Junio C Hamano
2016-11-21 20:41 ` [PATCH 3/3] submodule--helper: add intern-git-dir function Stefan Beller
2016-11-21 21:14 ` Junio C Hamano
2016-11-22 2:09 ` Stefan Beller
2016-11-22 7:07 ` Junio C Hamano
2016-11-22 17:16 ` Stefan Beller
2016-11-22 17:53 ` Junio C Hamano
2016-11-21 21:56 ` Brandon Williams [this message]
2016-11-21 20:48 ` [PATCH 0/3] Introduce `submodule interngitdirs` Junio C Hamano
2016-11-21 20:56 ` Stefan Beller
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=20161121215621.GB149321@google.com \
--to=bmwill@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jrnieder@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).