From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Jens.Lehmann@web.de, apenwarr@gmail.com,
jrnieder@gmail.com, Stefan Beller <sbeller@google.com>
Subject: [PATCHv3 1/7] t7406: future proof tests with hard coded depth
Date: Thu, 28 Jul 2016 17:44:03 -0700 [thread overview]
Message-ID: <20160729004409.2072-2-sbeller@google.com> (raw)
In-Reply-To: <20160729004409.2072-1-sbeller@google.com>
The prior hard coded depth was chosen to be exactly the length from the
recorded gitlink to the tip of the remote, so if you add more commits
to the remote before, this test will not test its intention any more.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
t/t7406-submodule-update.sh | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 88e9750..8fc3a25 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -841,16 +841,19 @@ test_expect_success SYMLINKS 'submodule update can handle symbolic links in pwd'
'
test_expect_success 'submodule update clone shallow submodule' '
+ test_when_finished "rm -rf super3" &&
+ first=$(git -C cloned submodule status submodule |cut -c2-41) &&
+ second=$(git -C submodule rev-parse HEAD) &&
+ commit_count=$(git -C submodule rev-list $first^..$second | wc -l) &&
git clone cloned super3 &&
pwd=$(pwd) &&
- (cd super3 &&
- sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
- mv -f .gitmodules.tmp .gitmodules &&
- git submodule update --init --depth=3
- (cd submodule &&
- test 1 = $(git log --oneline | wc -l)
- )
-)
+ (
+ cd super3 &&
+ sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
+ mv -f .gitmodules.tmp .gitmodules &&
+ git submodule update --init --depth=$commit_count &&
+ test 1 = $(git -C submodule log --oneline | wc -l)
+ )
'
test_expect_success 'submodule update --recursive drops module name before recursing' '
--
2.9.2.472.g1ffb07c.dirty
next prev parent reply other threads:[~2016-07-29 0:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-29 0:44 [PATCHv3 0/7] submodule update: allow '.' for branch value Stefan Beller
2016-07-29 0:44 ` Stefan Beller [this message]
2016-07-29 0:44 ` [PATCHv3 2/7] submodule update: respect depth in subsequent fetches Stefan Beller
2016-07-29 0:44 ` [PATCHv3 3/7] submodule update: narrow scope of local variable Stefan Beller
2016-07-29 0:44 ` [PATCHv3 4/7] submodule--helper: fix usage string for relative-path Stefan Beller
2016-07-29 0:44 ` [PATCHv3 5/7] submodule-config: keep configured branch around Stefan Beller
2016-07-29 0:44 ` [PATCHv3 6/7] submodule--helper: add remote-branch helper Stefan Beller
2016-08-03 16:25 ` Jeff King
2016-08-03 20:11 ` Stefan Beller
2016-08-03 20:15 ` Jeff King
2016-07-29 0:44 ` [PATCHv3 7/7] submodule update: allow '.' for branch value Stefan Beller
2016-08-01 21:48 ` [PATCHv3 0/7] " 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=20160729004409.2072-2-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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).