summaryrefslogtreecommitdiff
path: root/t/t4041-diff-submodule-option.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-06-14 10:58:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-15 16:10:47 (GMT)
commit17f2f88c9c9e0015cba6d962dc6d9e2329ddf713 (patch)
tree851b58e3a37492f23249c7fdc1b3e432c8085db4 /t/t4041-diff-submodule-option.sh
parent532139940c98a98bce2001bb495d75dec3d88e4d (diff)
downloadgit-17f2f88c9c9e0015cba6d962dc6d9e2329ddf713.zip
git-17f2f88c9c9e0015cba6d962dc6d9e2329ddf713.tar.gz
git-17f2f88c9c9e0015cba6d962dc6d9e2329ddf713.tar.bz2
t: move "git add submodule" into test blocks
Some submodule tests do some setup outside of a test_expect block. This is bad because we won't actually check the outcome of those commands. But it's doubly so because "git add submodule" now produces a warning to stderr, which is not suppressed by the test scripts in non-verbose mode. This patch does the minimal to fix the annoying warnings. All three of these scripts could use more cleanup of related setup. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4041-diff-submodule-option.sh')
-rwxr-xr-xt/t4041-diff-submodule-option.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index 2d9731b..058ee08 100755
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -430,9 +430,11 @@ test_expect_success 'deleted submodule' '
test_cmp expected actual
'
-test_create_repo sm2 &&
-head7=$(add_file sm2 foo8 foo9) &&
-git add sm2
+test_expect_success 'create second submodule' '
+ test_create_repo sm2 &&
+ head7=$(add_file sm2 foo8 foo9) &&
+ git add sm2
+'
test_expect_success 'multiple submodules' '
git diff-index -p --submodule=log HEAD >actual &&