]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/test-without-templates'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jul 2022 20:31:55 +0000 (13:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jul 2022 20:31:55 +0000 (13:31 -0700)
Tweak tests so that they still work when the "git init" template
did not create .git/info directory.

* ab/test-without-templates:
  tests: don't assume a .git/info for .git/info/sparse-checkout
  tests: don't assume a .git/info for .git/info/exclude
  tests: don't assume a .git/info for .git/info/refs
  tests: don't assume a .git/info for .git/info/attributes
  tests: don't assume a .git/info for .git/info/grafts
  tests: don't depend on template-created .git/branches
  t0008: don't rely on default ".git/info/exclude"

1  2 
t/annotate-tests.sh
t/t0028-working-tree-encoding.sh
t/t1011-read-tree-sparse-checkout.sh
t/t5000-tar-tree.sh
t/t5003-archive-zip.sh
t/t5505-remote.sh
t/t5516-fetch-push.sh
t/t6101-rev-parse-parents.sh
t/t7063-status-untracked-cache.sh
t/test-lib.sh

Simple merge
index 416eeabdb94fdc4a61576e9147cdc08ef2b284f3,7140960e1a3962795abb18f9ac962c6906f50504..c196fdb0ee21a27b6093902dcafe133abfc98ce0
@@@ -5,7 -5,7 +5,8 @@@ test_description='working-tree-encodin
  GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
  export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
  
 +TEST_PASSES_SANITIZE_LEAK=true
+ TEST_CREATE_REPO_NO_TEMPLATE=1
  . ./test-lib.sh
  . "$TEST_DIRECTORY/lib-encoding.sh"
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index a3a41c7a3e47899521d63c056532604a7d224c97,5f55ab98d352fcb24df355e0976586ed848347c1..d20723d627629f5379f35c33c74ff22d1082152e
@@@ -8,7 -8,7 +8,8 @@@ test_description='Test git rev-parse wi
  GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
  export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
  
 +TEST_PASSES_SANITIZE_LEAK=true
+ TEST_CREATE_REPO_NO_TEMPLATE=1
  . ./test-lib.sh
  
  test_cmp_rev_output () {
Simple merge
diff --cc t/test-lib.sh
Simple merge