]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Sync with 2.37.4
authorTaylor Blau <me@ttaylorr.com>
Fri, 7 Oct 2022 00:00:04 +0000 (20:00 -0400)
committerTaylor Blau <me@ttaylorr.com>
Fri, 7 Oct 2022 00:00:04 +0000 (20:00 -0400)
Signed-off-by: Taylor Blau <me@ttaylorr.com>
25 files changed:
1  2 
Documentation/config/protocol.txt
builtin/clone.c
t/lib-submodule-update.sh
t/t1092-sparse-checkout-compatibility.sh
t/t1500-rev-parse.sh
t/t2080-parallel-checkout-basics.sh
t/t2400-worktree-add.sh
t/t2403-worktree-move.sh
t/t3206-range-diff.sh
t/t3426-rebase-submodule.sh
t/t5516-fetch-push.sh
t/t5601-clone.sh
t/t6008-rev-list-submodule.sh
t/t6134-pathspec-in-submodule.sh
t/t7400-submodule-basic.sh
t/t7406-submodule-update.sh
t/t7413-submodule-is-active.sh
t/t7414-submodule-mistakes.sh
t/t7418-submodule-sparse-gitmodules.sh
t/t7419-submodule-set-branch.sh
t/t7450-bad-git-dotfiles.sh
t/t7506-status-submodule.sh
t/t7507-commit-verbose.sh
t/t7814-grep-recurse-submodules.sh
transport.c

Simple merge
diff --cc builtin/clone.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index b50db3f1031339b62071bd28b52094f90c644cb5,7fa8520f4cb5bd236e223b168e19934a991493c1..a989aafaf57aa8710ff7889318abb8d3c9cadd51
@@@ -14,32 -14,10 +14,36 @@@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_
  
  . ./test-lib.sh
  
+ test_expect_success 'setup - enable local submodules' '
+       git config --global protocol.file.allow always
+ '
 +test_expect_success 'submodule usage: -h' '
 +      git submodule -h >out 2>err &&
 +      grep "^usage: git submodule" out &&
 +      test_must_be_empty err
 +'
 +
 +test_expect_success 'submodule usage: --recursive' '
 +      test_expect_code 1 git submodule --recursive >out 2>err &&
 +      grep "^usage: git submodule" err &&
 +      test_must_be_empty out
 +'
 +
 +test_expect_success 'submodule usage: status --' '
 +      test_expect_code 1 git submodule -- &&
 +      test_expect_code 1 git submodule --end-of-options
 +'
 +
 +for opt in '--quiet' '--cached'
 +do
 +      test_expect_success "submodule usage: status $opt" '
 +              git submodule $opt &&
 +              git submodule status $opt &&
 +              git submodule $opt status
 +      '
 +done
 +
  test_expect_success 'submodule deinit works on empty repository' '
        git submodule deinit --all
  '
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc transport.c
Simple merge