summaryrefslogtreecommitdiff
path: root/t/t7400-submodule-basic.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-30 05:04:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-30 05:04:09 (GMT)
commit2a98a8794eac7089d4e44f51b19e358a14eb6d3e (patch)
treebcd3161145577f27c0b66e332b843ebfd52bff9f /t/t7400-submodule-basic.sh
parent4ce72180abe72dbb40f5e6a517deea814014e005 (diff)
parenta0ef29341accafa51345e90225d87f6a0d297b7b (diff)
downloadgit-2a98a8794eac7089d4e44f51b19e358a14eb6d3e.zip
git-2a98a8794eac7089d4e44f51b19e358a14eb6d3e.tar.gz
git-2a98a8794eac7089d4e44f51b19e358a14eb6d3e.tar.bz2
Merge branch 'cf/submodule-progress-dissociate'
"git submodule update" and "git submodule add" supported the "--reference" option to borrow objects from a neighbouring local repository like "git clone" does, but lacked the more recent invention "--dissociate". Also "git submodule add" has been taught to take the "--progress" option. * cf/submodule-progress-dissociate: submodule: add --dissociate option to add/update commands submodule: add --progress option to add command submodule: clean up substitutions in script
Diffstat (limited to 't/t7400-submodule-basic.sh')
-rwxr-xr-xt/t7400-submodule-basic.sh16
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 1521044..2f53252 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -126,6 +126,22 @@ test_expect_success 'submodule add' '
test_cmp empty untracked
'
+test_create_repo parent &&
+test_commit -C parent one
+
+test_expect_success 'redirected submodule add does not show progress' '
+ git -C addtest submodule add "file://$submodurl/parent" submod-redirected \
+ 2>err &&
+ ! grep % err &&
+ test_i18ngrep ! "Checking connectivity" err
+'
+
+test_expect_success 'redirected submodule add --progress does show progress' '
+ git -C addtest submodule add --progress "file://$submodurl/parent" \
+ submod-redirected-progress 2>err && \
+ grep % err
+'
+
test_expect_success 'submodule add to .gitignored path fails' '
(
cd addtest-ignore &&