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
This commit is contained in:
@ -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 &&
|
||||
|
||||
Reference in New Issue
Block a user