From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: pclouds@gmail.com, Jens.Lehmann@web.de, jacob.keller@gmail.com,
sunshine@sunshineco.com, Stefan Beller <sbeller@google.com>
Subject: [PATCHv3 3/5] submodule update: add test for recursive from non root dir
Date: Fri, 25 Mar 2016 11:39:14 -0700 [thread overview]
Message-ID: <1458931156-29125-4-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1458931156-29125-1-git-send-email-sbeller@google.com>
Test "submodule update --recursive" being invoked from a
sub directory as this is currently not covered by the test
suite.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
t/t7406-submodule-update.sh | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 68ea31d..19d8552 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -767,11 +767,19 @@ test_expect_success 'submodule update clone shallow submodule' '
test_expect_success 'submodule update --recursive drops module name before recursing' '
(cd super2 &&
- (cd deeper/submodule/subsubmodule &&
- git checkout HEAD^
- ) &&
+ git -C deeper/submodule/subsubmodule checkout HEAD^
git submodule update --recursive deeper/submodule >actual &&
test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
)
'
+
+test_expect_success 'submodule update --recursive works from subdirectory' '
+ (cd super2 &&
+ git -C deeper/submodule/subsubmodule checkout HEAD^
+ mkdir untracked &&
+ cd untracked &&
+ git submodule update --recursive >actual &&
+ test_i18ngrep "Submodule path .../deeper/submodule/subsubmodule.: checked out" actual
+ )
+'
test_done
--
2.8.0.rc4.10.g52f3f33.dirty
next prev parent reply other threads:[~2016-03-25 18:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-25 18:39 [PATCHv3 0/5] submodule helper: cleanup prefix passing Stefan Beller
2016-03-25 18:39 ` [PATCHv3 1/5] submodule: prepare recursive path from non root directory Stefan Beller
2016-03-25 19:21 ` Junio C Hamano
2016-03-25 18:39 ` [PATCHv3 2/5] submodule--helper list: lose the extra prefix option Stefan Beller
2016-03-25 18:39 ` Stefan Beller [this message]
2016-03-25 18:39 ` [PATCHv3 4/5] submodule sync: test syncing one submodule Stefan Beller
2016-03-25 18:39 ` [PATCHv3 5/5] submodule--helper clone: lose the extra prefix option Stefan Beller
2016-03-25 19:41 ` Junio C Hamano
2016-03-25 20:54 ` Junio C Hamano
2016-03-25 22:09 ` Stefan Beller
2016-03-25 22:39 ` Junio C Hamano
2016-03-25 23:02 ` Stefan Beller
2016-03-25 23:15 ` Junio C Hamano
2016-03-25 23:51 ` Stefan Beller
2016-03-28 16:56 ` Junio C Hamano
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=1458931156-29125-4-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=pclouds@gmail.com \
--cc=sunshine@sunshineco.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).