]> git.ipfire.org Git - thirdparty/git.git/commitdiff
tests: mark tests relying on the current default for `init.defaultBranch`
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 18 Nov 2020 23:44:19 +0000 (23:44 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Nov 2020 23:44:17 +0000 (15:44 -0800)
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.

To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in

- all test scripts that contain the keyword `master`,

- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
  initialize the default branch,

- t5560 because it sources `t/t556x_common` which uses `master`,

- t8002 and t8012 because both source `t/annotate-tests.sh` which also
  uses `master`)

This trick was performed by this command:

$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh

After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:

$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh

We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:

$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
325 files changed:
ci/run-build-and-tests.sh
t/t0002-gitfile.sh
t/t0020-crlf.sh
t/t0021-conversion.sh
t/t0028-working-tree-encoding.sh
t/t0041-usage.sh
t/t0050-filesystem.sh
t/t0100-previous.sh
t/t1004-read-tree-m-u-wf.sh
t/t1008-read-tree-overlay.sh
t/t1009-read-tree-new-index.sh
t/t1021-rerere-in-workdir.sh
t/t1090-sparse-checkout-scope.sh
t/t1091-sparse-checkout-builtin.sh
t/t1300-config.sh
t/t1301-shared-repo.sh
t/t1400-update-ref.sh
t/t1403-show-ref.sh
t/t1405-main-ref-store.sh
t/t1406-submodule-ref-store.sh
t/t1407-worktree-ref-store.sh
t/t1408-packed-refs.sh
t/t1410-reflog.sh
t/t1411-reflog-show.sh
t/t1413-reflog-detach.sh
t/t1414-reflog-walk.sh
t/t1416-ref-transaction-hooks.sh
t/t1430-bad-ref-name.sh
t/t1500-rev-parse.sh
t/t1503-rev-parse-verify.sh
t/t1505-rev-parse-last.sh
t/t1506-rev-parse-diagnosis.sh
t/t1507-rev-parse-upstream.sh
t/t1508-at-combinations.sh
t/t1511-rev-parse-caret.sh
t/t1512-rev-parse-disambiguation.sh
t/t1513-rev-parse-prefix.sh
t/t1514-rev-parse-push.sh
t/t1700-split-index.sh
t/t2007-checkout-symlink.sh
t/t2009-checkout-statinfo.sh
t/t2010-checkout-ambiguous.sh
t/t2011-checkout-invalid-head.sh
t/t2012-checkout-last.sh
t/t2015-checkout-unborn.sh
t/t2017-checkout-orphan.sh
t/t2020-checkout-detach.sh
t/t2022-checkout-paths.sh
t/t2023-checkout-m.sh
t/t2027-checkout-track.sh
t/t2030-unresolve-info.sh
t/t2060-switch.sh
t/t2070-restore.sh
t/t2400-worktree-add.sh
t/t2401-worktree-prune.sh
t/t2402-worktree-list.sh
t/t2405-worktree-submodule.sh
t/t3200-branch.sh
t/t3201-branch-contains.sh
t/t3202-show-branch-octopus.sh
t/t3203-branch-output.sh
t/t3204-branch-name-interpretation.sh
t/t3205-branch-color.sh
t/t3206-range-diff.sh
t/t3210-pack-refs.sh
t/t3211-peel-ref.sh
t/t3302-notes-index-expensive.sh
t/t3303-notes-subtrees.sh
t/t3304-notes-mixed.sh
t/t3320-notes-merge-worktrees.sh
t/t3400-rebase.sh
t/t3402-rebase-merge.sh
t/t3403-rebase-skip.sh
t/t3404-rebase-interactive.sh
t/t3405-rebase-malformed.sh
t/t3406-rebase-message.sh
t/t3407-rebase-abort.sh
t/t3408-rebase-multi-line.sh
t/t3409-rebase-preserve-merges.sh
t/t3412-rebase-root.sh
t/t3413-rebase-hook.sh
t/t3415-rebase-autosquash.sh
t/t3416-rebase-onto-threedots.sh
t/t3418-rebase-continue.sh
t/t3419-rebase-patch-id.sh
t/t3420-rebase-autostash.sh
t/t3427-rebase-subtree.sh
t/t3430-rebase-merges.sh
t/t3431-rebase-fork-point.sh
t/t3432-rebase-fast-forward.sh
t/t3434-rebase-i18n.sh
t/t3435-rebase-gpg-sign.sh
t/t3500-cherry.sh
t/t3501-revert-cherry-pick.sh
t/t3502-cherry-pick-merge.sh
t/t3503-cherry-pick-root.sh
t/t3504-cherry-pick-rerere.sh
t/t3505-cherry-pick-empty.sh
t/t3506-cherry-pick-ff.sh
t/t3507-cherry-pick-conflict.sh
t/t3508-cherry-pick-many-commits.sh
t/t3509-cherry-pick-merge-df.sh
t/t3512-cherry-pick-submodule.sh
t/t3600-rm.sh
t/t3701-add-interactive.sh
t/t3901-i18n-patch.sh
t/t3903-stash.sh
t/t3910-mac-os-precompose.sh
t/t4013-diff-various.sh
t/t4014-format-patch.sh
t/t4017-diff-retval.sh
t/t4038-diff-combined.sh
t/t4041-diff-submodule-option.sh
t/t4048-diff-combined-binary.sh
t/t4052-stat-output.sh
t/t4056-diff-order.sh
t/t4057-diff-combined-paths.sh
t/t4061-diff-indent.sh
t/t4066-diff-emit-delay.sh
t/t4068-diff-symmetric-merge-base.sh
t/t4103-apply-binary.sh
t/t4108-apply-threeway.sh
t/t4121-apply-diffs.sh
t/t4122-apply-symlink-inside.sh
t/t4150-am.sh
t/t4200-rerere.sh
t/t4201-shortlog.sh
t/t4202-log.sh
t/t4203-mailmap.sh
t/t4204-patch-id.sh
t/t4207-log-decoration-colors.sh
t/t4208-log-magic-pathspec.sh
t/t4211-line-log.sh
t/t4214-log-graph-octopus.sh
t/t4216-log-bloom.sh
t/t4253-am-keep-cr-dos.sh
t/t5150-request-pull.sh
t/t5304-prune.sh
t/t5305-include-tag.sh
t/t5310-pack-bitmaps.sh
t/t5312-prune-corruption.sh
t/t5317-pack-objects-filter-objects.sh
t/t5322-pack-objects-sparse.sh
t/t5400-send-pack.sh
t/t5402-post-merge-hook.sh
t/t5403-post-checkout-hook.sh
t/t5404-tracking-branches.sh
t/t5405-send-pack-rewind.sh
t/t5407-post-rewrite-hook.sh
t/t5410-receive-pack-alternates.sh
t/t5500-fetch-pack.sh
t/t5501-fetch-push-alternates.sh
t/t5502-quickfetch.sh
t/t5503-tagfollow.sh
t/t5504-fetch-receive-strict.sh
t/t5505-remote.sh
t/t5506-remote-groups.sh
t/t5509-fetch-push-namespaces.sh
t/t5510-fetch.sh
t/t5512-ls-remote.sh
t/t5514-fetch-multiple.sh
t/t5516-fetch-push.sh
t/t5517-push-mirror.sh
t/t5518-fetch-exit-status.sh
t/t5519-push-alternates.sh
t/t5520-pull.sh
t/t5521-pull-options.sh
t/t5523-push-upstream.sh
t/t5526-fetch-submodules.sh
t/t5527-fetch-odd-refs.sh
t/t5528-push-default.sh
t/t5531-deep-submodule-push.sh
t/t5533-push-cas.sh
t/t5534-push-signed.sh
t/t5537-fetch-shallow.sh
t/t5538-push-shallow.sh
t/t5539-fetch-http-shallow.sh
t/t5540-http-push-webdav.sh
t/t5541-http-push-smart.sh
t/t5542-push-http-shallow.sh
t/t5543-atomic-push.sh
t/t5545-push-options.sh
t/t5550-http-fetch-dumb.sh
t/t5551-http-fetch-smart.sh
t/t5553-set-upstream.sh
t/t5560-http-backend-noserver.sh
t/t5561-http-backend.sh
t/t5570-git-daemon.sh
t/t5571-pre-push-hook.sh
t/t5580-unc-paths.sh
t/t5581-http-curl-verbose.sh
t/t5582-fetch-negative-refspec.sh
t/t5601-clone.sh
t/t5604-clone-reference.sh
t/t5605-clone-local.sh
t/t5606-clone-options.sh
t/t5607-clone-bundle.sh
t/t5609-clone-branch.sh
t/t5610-clone-detached.sh
t/t5611-clone-config.sh
t/t5612-clone-refspec.sh
t/t5616-partial-clone.sh
t/t5617-clone-submodules-remote.sh
t/t5700-protocol-v1.sh
t/t5701-git-serve.sh
t/t5702-protocol-v2.sh
t/t5703-upload-pack-ref-in-want.sh
t/t5801-remote-helpers.sh
t/t6000-rev-list-misc.sh
t/t6001-rev-list-graft.sh
t/t6004-rev-list-path-optim.sh
t/t6006-rev-list-format.sh
t/t6007-rev-list-cherry-pick-file.sh
t/t6008-rev-list-submodule.sh
t/t6009-rev-list-parent.sh
t/t6012-rev-list-simplify.sh
t/t6013-rev-list-reverse-parents.sh
t/t6016-rev-list-graph-simplify-history.sh
t/t6017-rev-list-stdin.sh
t/t6018-rev-list-glob.sh
t/t6019-rev-list-ancestry-path.sh
t/t6030-bisect-porcelain.sh
t/t6040-tracking-info.sh
t/t6050-replace.sh
t/t6101-rev-parse-parents.sh
t/t6110-rev-list-sparse.sh
t/t6111-rev-list-treesame.sh
t/t6112-rev-list-filters-objects.sh
t/t6120-describe.sh
t/t6200-fmt-merge-msg.sh
t/t6300-for-each-ref.sh
t/t6302-for-each-ref-filter.sh
t/t6400-merge-df.sh
t/t6402-merge-rename.sh
t/t6404-recursive-merge.sh
t/t6405-merge-symlinks.sh
t/t6406-merge-attr.sh
t/t6407-merge-binary.sh
t/t6409-merge-subtree.sh
t/t6411-merge-filemode.sh
t/t6412-merge-large-rename.sh
t/t6413-merge-crlf.sh
t/t6414-merge-rename-nocruft.sh
t/t6415-merge-dir-to-symlink.sh
t/t6416-recursive-corner-cases.sh
t/t6417-merge-ours-theirs.sh
t/t6418-merge-text-auto.sh
t/t6419-merge-ignorecase.sh
t/t6422-merge-rename-corner-cases.sh
t/t6425-merge-rename-delete.sh
t/t6427-diff3-conflict-markers.sh
t/t6430-merge-recursive.sh
t/t6432-merge-recursive-space-options.sh
t/t6433-merge-toplevel.sh
t/t6434-merge-recursive-rename-options.sh
t/t6436-merge-overwrite.sh
t/t6437-submodule-merge.sh
t/t6439-merge-co-error-msgs.sh
t/t6501-freshen-objects.sh
t/t7003-filter-branch.sh
t/t7004-tag.sh
t/t7030-verify-tag.sh
t/t7060-wtstatus.sh
t/t7063-status-untracked-cache.sh
t/t7064-wtstatus-pv2.sh
t/t7102-reset.sh
t/t7113-post-index-change-hook.sh
t/t7201-co.sh
t/t7400-submodule-basic.sh
t/t7403-submodule-sync.sh
t/t7406-submodule-update.sh
t/t7407-submodule-foreach.sh
t/t7409-submodule-detached-work-tree.sh
t/t7417-submodule-path-url.sh
t/t7501-commit-basic-functionality.sh
t/t7502-commit-porcelain.sh
t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
t/t7504-commit-msg-hook.sh
t/t7505-prepare-commit-msg-hook.sh
t/t7510-signed-commit.sh
t/t7512-status-help.sh
t/t7517-per-repo-email.sh
t/t7600-merge.sh
t/t7608-merge-messages.sh
t/t7610-mergetool.sh
t/t7611-merge-abort.sh
t/t7612-merge-verify-signatures.sh
t/t7614-merge-signoff.sh
t/t7701-repack-unpack-unreachable.sh
t/t7800-difftool.sh
t/t7810-grep.sh
t/t8001-annotate.sh
t/t8002-blame.sh
t/t8003-blame-corner-cases.sh
t/t8004-blame-with-conflicts.sh
t/t8012-blame-colors.sh
t/t9001-send-email.sh
t/t9100-git-svn-basic.sh
t/t9145-git-svn-master-branch.sh
t/t9151-svn-mergeinfo.sh
t/t9155-git-svn-fetch-deleted-tag.sh
t/t9156-git-svn-fetch-deleted-tag-2.sh
t/t9163-git-svn-reset-clears-caches.sh
t/t9169-git-svn-dcommit-crlf.sh
t/t9300-fast-import.sh
t/t9301-fast-import-notes.sh
t/t9350-fast-export.sh
t/t9351-fast-export-anonymize.sh
t/t9400-git-cvsserver-server.sh
t/t9401-git-cvsserver-crlf.sh
t/t9402-git-cvsserver-refs.sh
t/t9500-gitweb-standalone-no-errors.sh
t/t9501-gitweb-standalone-http-status.sh
t/t9502-gitweb-standalone-parse-output.sh
t/t9600-cvsimport.sh
t/t9601-cvsimport-vendor-branch.sh
t/t9602-cvsimport-branches-tags.sh
t/t9603-cvsimport-patchsets.sh
t/t9800-git-p4-basic.sh
t/t9801-git-p4-branch.sh
t/t9806-git-p4-options.sh
t/t9807-git-p4-submit.sh
t/t9811-git-p4-label-import.sh
t/t9902-completion.sh
t/t9903-bash-prompt.sh

index 6c27b886b8f0cfb8d16a82318d884725a1ed607c..50e0b90073f13307f902286dd3bad560363d05f1 100755 (executable)
@@ -13,6 +13,7 @@ esac
 make
 case "$jobname" in
 linux-gcc)
+       export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
        make test
        export GIT_TEST_SPLIT_INDEX=yes
        export GIT_TEST_FULL_IN_PACK_ARRAY=true
@@ -22,6 +23,7 @@ linux-gcc)
        export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1
        export GIT_TEST_MULTI_PACK_INDEX=1
        export GIT_TEST_ADD_I_USE_BUILTIN=1
+       export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
        make test
        ;;
 linux-clang)
index 960ed150cb59055fb3f597a0cc80542828ac4ebb..0a396c95e5d01899912ed440f945acb6f9fe386d 100755 (executable)
@@ -4,6 +4,9 @@ test_description='.git file
 
 Verify that plumbing commands work when .git is a file
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 objpath() {
index b63ba62e5db4760813b04c26414c497b8aadbfbe..0d431890485a1ef9c72fa5e32ee9ce84e5761dad 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='CRLF conversion'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 has_cr() {
index f6deaf498ba9df88f9ea8c648aa3e6ce058207c9..adf862aef1d0e950ded84664cf67a8f198a7f3ba 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='blob conversion via gitattributes'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 TEST_ROOT="$PWD"
index bfc4fb9af5f274fe9adcd631d730b74ed368551a..ccdc91c41c0484a0e504c9775a7e4f1d99b3a3d1 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='working-tree-encoding conversion via gitattributes'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING
index 5b927b76fe58e5284d7b74e2f9fd8cc0b1f07764..068b784e7251c7dfe25626b124f87c012334bbfb 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='Test commands behavior when given invalid argument value'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup ' '
index 608673fb775de5e9e83a91aa2455a87dc0cf32ea..368f7d515b24cfbb9554d3c1bcdb835e683f7026 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='Various filesystem issues'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 auml=$(printf '\303\244')
index 58c0b7e9b6d99a6ea8a507da89eb66f3c8780c31..c3c2770ab31f629f2a60d9155673c03e2c4905d2 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='previous branch syntax @{-n}'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'branch -d @{-1}' '
index 181956b24137f2de91117d344b61c28214000a9f..57caa3a73f1aed503d90a5ea8a40e4042a89db2d 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='read-tree -m -u checks working tree files'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
index cf96016844822cfec9998f107baebf15cb4c70db..edb89447c7b31ff6540e538b9f0d537edd1339cf 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test multi-tree read-tree without merging'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
index 59b3aa4bc40225b753626a0b94f555a8a1a02fcd..b9bab37ac08fb608a6765711b7e5bd736a14c8df 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test read-tree into a fresh index file'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 301e071ff7d702e18ec3b75c39fb997307b729af..9177871c995253bb1e3bf46674ab8a1ba8a19440 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='rerere run in a workdir'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success SYMLINKS setup '
index f35a73dd20654c82db3c2703373f521718c27766..d7313226335fe1ae29066c6f93ee79d23a6b6f4d 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='sparse checkout scope tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 84acfc48b6786a43d82f5185465c42f4417b9a02..25e68ca036d0e0ea232b1db28776ebb8b40559cc 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='sparse checkout builtin tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 list_files() {
index 825d9a184fbbf4c14a7b6b5d98125947d3336666..67e201b5c116811ac0fbb1d65bc4d063bf878836 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Test git config in different settings'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'clear default config' '
index 2dc853d1be5f0fe012d40b5d020fcbfd7638ccb7..c573438f9839bcda25d45085e4dc544926152fb6 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Test shared repository initialization'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Remove a default ACL from the test dir if possible.
index 4c01e08551e5b8ea203f53b1e50f81a36ce27731..4ae6f50c0291f06bd29fe4356bb706d608d6c5d7 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='Test git update-ref and basic ref logging'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 Z=$ZERO_OID
index 5d955c3bff2ce9c276acd363f7c906565333da79..aaf32f3b07fd0a6f0ef545f3f87944f4b6c68db9 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='show-ref'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 74af927fbaa7300ed3a20fb51fe32f8b5fcd1835..531059b871b49c695b83f7a7105b3c9c48c28851 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test main ref store api'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 RUN="test-tool ref-store main"
index 36b7ef504687f52e50fd4fef1500bc487c6f286d..126518c1559ce3efca3687b380723fd0e6bc0591 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test submodule ref store api'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 RUN="test-tool ref-store submodule:sub"
index 9a848581180ff73b41b345e448e427457b487ff7..aede1c20d7e6af7fa20d12a78788e19bdf2e8073 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test worktree ref store api'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 RWT="test-tool ref-store worktree:wt"
index 1e44a17eead4dc8efb9aa6594ef8108e71532d78..fd58388232c689e557f45b9146156b827f749dac 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='packed-refs entries are covered by loose refs'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 730a43d9ddc2c051a954af10121763c32fbb299b..aa02ca488d608f57b54b2320567359195dc276ea 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='Test prune and reflog expiration'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_have () {
index 985daf1def366fd1aa928bd2ddeeca454c4702ca..f6fecff671404e6f715a1f9acba53bccab70a3e7 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Test reflog display routines'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index c730600d8a78c537e52bdf6acc9798a6809b6295..140914aa29d67ed0a7efc4ed8162924094eb30ed 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Test reflog interaction with detached HEAD'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 reset_state () {
index 1181a9fb28e359e803ef5672ff7742187e7730f1..c463b5fc29b0c1dd01550d8ec3844a6282c5c3c9 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='various tests of reflog walk (log -g) behavior'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'set up some reflog entries' '
index f6e741c6c055a4e62fdbb16f50eedc7dcd4b383d..a26a6b782d2d1d5b9c888cf04100363d434ede99 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='reference transaction hooks'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index c7878a60edfdcf24f3c45367f58e62b0ce6dab71..8c4353746b1d6bf4bc40c9d06a67942177d7991e 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Test handling of ref names that check-ref-format rejects'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 408b97d5af9551f91a86e70c6c37b912719bfd15..d23da4e8de0c2151cecb0d689cfeeb7ab8dc79d5 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test git rev-parse'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # usage: [options] label is-bare is-inside-git is-inside-work prefix git-dir absolute-git-dir
index 492edffa9cfb626b4747ead04251fc33b0502ac9..bb2c131ad8284051c5d48e8f9ccd0104e8592099 100755 (executable)
@@ -6,6 +6,9 @@ test_description='test git rev-parse --verify'
 
 exec </dev/null
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 add_line_into_file()
index 4969edb31441c81cf2e63385d07d780a52faa53b..9bd0307b5dc573acfdf54c01eabe7339f9bffdb3 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test @{-N} syntax'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
index 3e657e693b272dec5711593ae85eec7c6725b9dc..d1954fa57f9206ddcfcdf02eca7ed5dc42dae69f 100755 (executable)
@@ -4,6 +4,9 @@ test_description='test git rev-parse diagnosis for invalid argument'
 
 exec </dev/null
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_did_you_mean ()
index dfc0d96d8a8a834743781a08a8ea1c5f9dd63bda..521233a3c3e12f37a4d222e9fb88f70be6a490f7 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test <branch>@{upstream} syntax'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
index 4a9964e9dc4e0437b703a35a727e7e1971cf06fd..8e73633761fef1401c809de07da975ad769d0cf9 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test various @{X} syntax combinations together'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check() {
index e0a49a651fdd3b3f7d9e0f24e00439c9642f896c..cfb2ea5e0418fc980a0dbfc55469b8dd2b466b1a 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='tests for ref^{stuff}'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 18fa6cf40d372cb38b551bb858bf6058e5c33198..2ef1f2b7e86925e0d969921520140cdf4d682829 100755 (executable)
@@ -20,6 +20,9 @@ one tagged as v1.0.0.  They all have one regular file each.
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq SHA1
index 87ec3ae714881e8e77b5a8144965618f7dff7b1b..d151ef92188bf248dafe91e2ea17f86313625c41 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='Tests for rev-parse --prefix'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 788cc91e452ce02af1c068b8c7b0bb1aa88ae395..173ba2792b4a320d7f2bbd62bc55a2984ad53714 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test <branch>@{push} syntax'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 resolve () {
index 12a556884427b87e8f3d6784ba638a446f6bf7c2..7d4a6f1e938d1bdbe979bbb17295c4f5067edf1f 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='split index mode tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # We need total control of index splitting here
index fc9aad530e9f9078e95d99da5c1d0849e489d4cf..8879a78b8507e957795498f5c759bd5158f785de 100755 (executable)
@@ -4,6 +4,9 @@
 
 test_description='git checkout to switch between branches with symlink<->dir'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index f3c21520877e271506be13b5cabad5e7906f0c91..9af4d6ca5ecfe08558f134c4d2daaa793a156568 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='checkout should leave clean stat info'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 2e47fe01cfaf565777c9359e7c2675ef051c33e3..3f5431e033f6b33697b6c05ef050bfc0eeec5209 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='checkout and pathspecs/refspecs ambiguities'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 0e8d56aa7631cb30eebd468abe8d93f720d92913..fede33ff1f5376cad7120803b4735cbaa5797df4 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='checkout switching away from an invalid branch'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index e7ba8c505f579ab5cd53ee713eaf6ca894e471a1..16bf19f7ee11ca7c99adb28ab2e53b7ea19e566f 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='checkout can switch to last branch and merge base'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 37bdcedcc952083ba336cb9eaca5c67424d2cbb6..669a70c76f28882dd808afc48504e6eb2eb185a5 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='checkout from unborn branch'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 655f278c5f87926311979732eb6c129a14dd87d3..999e976c62e387d8b2e47b5ff75ca34270d7f892 100755 (executable)
@@ -7,6 +7,9 @@ test_description='git checkout --orphan
 
 Main Tests for --orphan functionality.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 TEST_FILE=foo
index b748db9946eff1f1c4f45ffae61ee84f15db0f05..45d87c23b1ce90b2746d3bc5f6bde5c90469be13 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='checkout into detached HEAD state'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_detached () {
index 6844afafc0eb926713e73c1042874155d18c08bc..fc0f5b775cbcc834c3eaaa2272c2158667624fc7 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='checkout $tree -- $paths'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index fca3f858245781229ea29b4baeb86e356f50a571..f2f4f5b3ac02a442b75ebc3c591e8eadfa78efd2 100755 (executable)
@@ -4,6 +4,9 @@ test_description='checkout -m -- <conflicted path>
 
 Ensures that checkout -m on a resolved file restores the conflicted file'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index bcba1bf90c090a00e7e734aac4cb5a2d55ed1f66..4e1419ca983e82b964fcc6a3fe55ee9f55f264a3 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='tests for git branch --track'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 309199bca272b63499ca69edbb953bcc8c770ecc..3fe29fc3eefcfaf7921bbf77f9240473029bbf77 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='undoing resolution'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_resolve_undo () {
index 68c9101b02f32d943ec5c167d7a726747f5970e4..4de9299705f3bf4f98d82b7b0f07e9d9fe993a4a 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='switch basic functionality'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 89e5a142c9e2284ca7931560af50074b0d6e6c8e..6941769c9a3cd3c0312cbdfc9d7e5f58b7c235de 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='restore basic functionality'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 5a7495474aa8723f77b296813381151ca39b4b8b..35cef266e976d01271fe2edcd7110ef27013edda 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test git worktree add'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
index a6ce7f590b64ffcaaf41a7dc9c0b9de7a6aac46a..e6fc27de1ee1191182dd67f6b8fbaac40cf6e7b8 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='prune $GIT_DIR/worktrees'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success initialize '
index 795ddca2e438f4c83df373bfe94195de60fd90bd..3b23b0fdb783503eb6739664173566cd3459d449 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test git worktree list'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index e1b2bfd87e0d598139ad974db4d546d6d01397b2..cca2aea6589511c331c8750ec1a1048954362bab 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='Combination of submodules and multiple worktrees'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 base_path=$(pwd -P)
index a0b832d59e611cd848a1bf5fc8d6334cbd5f3833..04b568cf2144572264628e0b22e8b0b89413aa6e 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='git branch assorted tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
index 3733cd0091e5a44f059e402ec8283681356375ab..532cdbe9aeb86a2bc8ed91ab61318a409a886b4a 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 6adf47869c468a98ce41bc3dd1396b81dc50af3f..bbf7129dd8c0063bc88b427dc66ff2ac1409878a 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test show-branch with more than 8 heads'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 numbers="1 2 3 4 5 6 7 8 9 10"
index d65586541d2cce7a7466cfe735eb87f831afd589..a2144dd8e552411018155df2cd2c0b84a729cefe 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git branch display tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
index 698d9cc4f3d65754552b8ccdd46b0cb64aea09c5..dd315ebf044542639ccdae38066f59f3f9c2db4d 100755 (executable)
@@ -6,6 +6,9 @@ Branch name arguments are usually names which are taken to be inside of
 refs/heads/, but we interpret some magic syntax like @{-1}, @{upstream}, etc.
 This script aims to check the behavior of those corner cases.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 expect_branch() {
index 289625c4646464c412384c6c498383fe7e577da3..8b54a9252bc3966bf65bb41e80304150700c90a5 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='basic branch output coloring'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'set up some sample branches' '
index 6eb344be0312a4e125a036d673b56f9b236a822c..3813ddc85e1eaf9c57ed3932b802459b57a7ae5a 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='range-diff tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Note that because of the range-diff's heuristics, test_commit does more
index f41b2afb9964b57a0010a80af7412a88678d6e25..90eea195649efb8405305bdcc1b9de99370848ad 100755 (executable)
@@ -9,6 +9,9 @@ test_description='git pack-refs should not change the branch semantic
 This test runs git pack-refs and git show-ref and checks that the branch
 semantic is still the same.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'enable reflogs' '
index 3b7caca4212ea8ee99e8dba8955eab73f0e2f3df..f3d9c6b6b61c5f83e4ad049ca1ec684d4fb62a2e 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='tests for the peel_ref optimization of packed-refs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'create annotated tag in refs/tags' '
index 7217c5e222baf0b99b934e36b9418c9d8e13ae9d..1564befe0080511fa6a6945dbe090c01e6ddbbbb 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Test commit notes index (expensive!)'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 create_repo () {
index 704aee81ef5618048bba5209629a0dfde136fdb3..16f3438355d06a171471951d6894dd1c13c1db84 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='Test commit notes organized in subtrees'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 number_of_commits=100
index 1709e8c00b859ae4f8ce91c7920a9411ac4acbce..6a7b8e28296323f57babc49731e1fe3a27b534c6 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='Test notes trees that also contain non-notes'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 number_of_commits=100
index 823fdbda1f32355e6db952976c1210b35fd452ec..f86975414cf769e6b3a2f19bbea2a5131a35a073 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Test merging of notes trees in multiple worktrees'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup commit' '
index 40d297599584af8fc13b5ddfbb7a991db190c163..61577591d091676bcb3690659f6a227cc9d55b98 100755 (executable)
@@ -8,6 +8,9 @@ test_description='git rebase assorted tests
 This test runs git rebase and checks that the author information is not lost
 among other things.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 GIT_AUTHOR_NAME=author@name
index 6e032716a687a3cd64b37683c67d3a476f06287f..d79a11b68641da8dcc12c99abf30524ba45d0f5a 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='git rebase --merge test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 T="A quick brown fox
index a927774910bc058a9d661e59b1670f4fd043fc5f..c9936cb1d9a908a18721b5e352d468b31259a365 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='git rebase --merge --skip tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
index 1e56696e4ff2aac546a473e9a8e5391a5b4fef16..9c91524e12f97558f3029a98fb853d0683a2a4a6 100755 (executable)
@@ -25,6 +25,9 @@ Initial setup:
  where A, B, D and G all touch file1, and one, two, three, four all
  touch file "conflict".
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
index 860e63e444d296c64773bae0d743fbb80fe674f1..d8f6d2e3cbf72b85ea4c7b618a30f8d80725e107 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='rebase should handle arbitrary git message'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
index 4afc528165998e3e16d9a444a936f7f46f861335..863db3ac4ca4efabab08978989dd4d42e37e538d 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='messages from rebase operation'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 97efea0f569714792e82ae7c66a796d6f44ee3be..e3c1851f40ce152738a98a1cf23f12bc25bd8318 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git rebase --abort tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 ### Test that we handle space characters properly
index d2bd7c17b01126c16d469592df191165ef618952..6dd56c4c15a3f10a7afb8b89e97c03f1a87edec9 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='rebasing a commit with multi-line first paragraph.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 3b340f1ece3601b0729d09ea1f976db5b3a8ef65..609efc96f90fccec6a3a92a5b60ec66e978c3971 100755 (executable)
@@ -6,6 +6,9 @@ test_description='git rebase -p should preserve merges
 
 Run "git rebase -p" and check that merges are properly carried along
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq REBASE_P; then
index 21632a984e76d94a4b8c800d12b837904f52d9a6..07597643c55916ce58aca0bb8d8ad15b2171f1c8 100755 (executable)
@@ -4,6 +4,9 @@ test_description='git rebase --root
 
 Tests if git rebase --root --onto <newparent> can rebase the root commit.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 log_with_names () {
index b6833e9a5fead6d2b47ce8a3d517f64cba6a1514..86a1b82d657e731c937580176afc83fc21985fff 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git rebase with its hook(s)'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 7bab6000dc73fc1639e2f215b2632ed3c97c9f99..35eb8e2bb29cd8965e9055e1e29474d16c294cbc 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='auto squash'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
index 9c2548423bcef02e060d0c7047e920f3e6f2485a..0f5b814aaf287b0d591dae022f74dd1fb3cc83d2 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git rebase --onto A...B'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-rebase.sh"
 
index 7a2da972fd373cde3cc233472acadc0ae803bd29..445cb843bac03149fd4452a05b1e5c7695035ca7 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git rebase --continue tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
index 1f32faa4a4db3d0307365af0c9cbd5bf58ff964f..c5fe58d68b315d14aae23ba7dc282a57151f90c9 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git rebase - test patch id computation'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 scramble () {
index ca331733fbb58e7d9f4c2e27d186b24170e56b36..95facc49aa58ab67668c33a576d02484b42db9bd 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='git rebase --autostash tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 5839719ba16e2ca27d688e5ea6f485a5c1c4f25c..254ed184524aafa686ddf5309dfb3f5e5b708e01 100755 (executable)
@@ -4,6 +4,9 @@ test_description='git rebase tests for -Xsubtree
 
 This test runs git rebase and tests the subtree strategy.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
index b454f400ebdc22a0c64ee20940f57966ed794709..22d929bd316da78db502b9017f1310e48ce34554 100755 (executable)
@@ -18,6 +18,9 @@ Initial setup:
      \
       Conflicting-G
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
 . "$TEST_DIRECTORY"/lib-log-graph.sh
index 172562789e474042922db296c0fce842f2d25437..af862e5bcc9ffff6e2b65218d967d1116ea7c84e 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='git rebase --fork-point test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # A---B---D---E    (master)
index a29eda87e9a1265bcddd300628bf43f4167e47e3..112a18d630950e7ccdb27e93dbacbd2d79536358 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='ensure rebase fast-forwards commits when possible'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index c7c835cde9b23b26675b5d5b1729e8be6a2b6d26..26fd33cbed8a172aca110b49163e2accfb4d67e5 100755 (executable)
@@ -14,6 +14,9 @@ Initial setup:
     5 - 6          second
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 compare_msg () {
index 54120b09d6e9b6e29784393458671d715b06efc4..d169bc511d96a7bd0023af34c7ad2a282ed24834 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='test rebase --[no-]gpg-sign'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-rebase.sh"
 . "$TEST_DIRECTORY/lib-gpg.sh"
index 2b8d9cb38ed3e3c39dd386b767f88d13e06532af..99905dd49adb4aa4584d1776a898ebe2449d11cf 100755 (executable)
@@ -8,6 +8,9 @@ test_description='git cherry should detect patches integrated upstream
 This test cherry-picks one local change of two into master branch, and
 checks that git cherry only returns the second patch in the local branch
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 GIT_AUTHOR_EMAIL=bogus_email_address
index 3669dfb1bed5bee1130f672aace510dca020ae7c..6a10714e229d01e30a31eeb1ab991a22184ad2cd 100755 (executable)
@@ -10,6 +10,9 @@ test_description='test cherry-pick and revert with renames
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 8b635a196d5cc57016520466b92b5f439b217a9d..774ad9ce141a1ae99942e018d1fd0c0d49b5a38e 100755 (executable)
@@ -8,6 +8,9 @@ test_description='cherry picking and reverting a merge
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index e27f39d1e5b0fb0ac3a1fc6417f0f3240934f07d..00c622d5dcf622f66820a97c0ca6af1a5ce68280 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test cherry-picking (and reverting) a root commit'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 80a0d087065398732a8ca74bb87c4509b3c8b0b1..860ba0b496e54ff5f599fafe3eaa4dbe145d85a3 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='cherry-pick should rerere for conflicts'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 5f911bb5290f33126380c45f3f5874d03f78a677..20cd4052d486a8b291fabb8448d8051cdf56b718 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test cherry-picking an empty commit'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 9d5adbc130b19bc955eb25742d89333ccc9fe22b..a105a782f639c21793ab61412e1983b0fe4c5a0b 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test cherry-picking with --ff option'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index a21adcf0e43a6d6003e60809a3dc8f20772fef2e..e94264e5783d83a3b8dd4ee5dac2227531711ef7 100755 (executable)
@@ -9,6 +9,9 @@ test_description='test cherry-pick and revert with conflicts
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 pristine_detach () {
index 23070a7b73caf9baf1ae65d7b7ff282a0830c4e1..b967bf063917d532653fae7d0937bff283084433 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test cherry-picking many commits'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_head_differs_from() {
index 1e5b3948dfc5d28a070ba83db361163002e7c3ae..83cab7b2ede99e4316219ac7fc16db4541391743 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Test cherry-pick with directory/file conflicts'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'Initialize repository' '
index 6ece1d85736ade855d661a7e34d687e6a85d656b..ff33c6d5c917b099600e84ada903bab1d5a35a6e 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='cherry-pick can handle submodules'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
 
index efec8d13b661826af434db6b891a404118301735..3baa64bf996f3f553992a1321d4ba9c4ac5e36e4 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Test of the various options to git rm.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Setup some files to be removed, some with funny characters
index ca04fac4179d546cd61864e549ce8467efa95f09..9be75275317375443e13a17d68425ab817a534bf 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='add -i basic tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
index 923eb01f0ea4bec0d3a7d96a2492a0755ad00ef9..bde27227b6ca9d579986d1cc95b8de8e5a5cfe6f 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='i18n settings and format-patch | am pipe'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_encoding () {
index 9f7ca9896755ecf38ad09f136cc75d6cbb18542b..49d52c46ad94de5946f4a480c3aaae9c37e26422 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Test git stash'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 diff_cmp () {
index 54ce19e353d924de08d4242f519fef7a44ce4787..a2d1cdec6d78fa83df95d54db030fde08ba53194 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='utf-8 decomposed (nfd) converted to precomposed (nfc)'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq UTF8_NFD_TO_NFC
index f72d456d3bc32a18222a96790894648ec858f968..45f68ebcdb504efe2230a188849c8b94129d33f4 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Various diff formatting options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 
index 42588bf6e11fd5ff0aee94e0cffeab3a62f963c8..6231204f84c231528b340b972121054b25136939 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='various format-patch tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
index 95a7ca707045cad3362b92c18df73e82206a2844..0b379c307beb16e0b28109638a0ec58f5e94da9f 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='Return value of diffs'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 94680836ceb5ebd15b8f1d2bdd1a10ca1cde9282..e873abb1da13309dd7299a2386c63294db954eca 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='combined diff'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 
index f85213658560c5f1f268e11bc2388a3279361c5f..8014cd684b4c044ce8559efb86000e02c167dbc1 100755 (executable)
@@ -9,6 +9,9 @@ test_description='Support for verbose submodule differences in git diff
 This test tries to verify the sanity of the --submodule option of git diff.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Tested non-UTF-8 encoding
index 7f9ad9fa3d1f97b9aeedbb0c1d351be5749837ee..e2780e697a4aef363dc40c1e270055190a7914de 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='combined and merge diff handle binary files and textconv'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup binary merge conflict' '
index 28c053849aafa8811a13131a8f705838f50ec97d..a9aef7f986feec5a16d8edc11b3bc35ef92b80d7 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='test --stat output of various commands'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
index 43dd474a12e97945d38de00f7ab99f30d73490ea..723eee4e8e138ca51ca3d5343a175b86f0d5c756 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='diff order'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 create_files () {
index 0b78573733b30716d1ed4fb8bd2fdeee0c5b9d83..71af157bf9db6039944e1beef4ae8dcfc20d077f 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='combined diff show only paths that are different to all parents'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # verify that diffc.expect matches output of
index 0f7a6d97a8b7e23959ef0c0bf7968fd69339283a..cbe64d5f79b0d015b50815bc7a03434de4956f2c 100755 (executable)
@@ -3,6 +3,9 @@
 test_description='Test diff indent heuristic.
 
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 
index 6331f63b127cc7a7ecf63000c99e2876b1ee4dfb..1983f1ebbe3f1044fa5411f03174d541b778bbd2 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test combined/stat/moved interaction'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # This test covers a weird 3-way interaction between "--cc -p", which will run
index 03487cc945d0ffcf2e16a2a1e0acf3989703905c..55d47352ba9ea44bfd8a10256b1818725a5395c5 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='behavior of diff with symmetric-diff setups and --merge-base'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # build these situations:
index 1b420e3b5fc2a7130d2b10bcd5660670b9d780c8..ee4a74b132c1c567882b48b6fa2fa598cae3273a 100755 (executable)
@@ -6,6 +6,9 @@
 test_description='git apply handling binary patches
 
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index d7349ced6be0aa1d717dbd0c312a65c8314235b3..0a091dc5a04a301fd58462d3230278731b01878c 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git apply --3way'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 print_sanitized_conflicted_diff () {
index 66368effd5c04ebeaeba30e30eaf9ba9d7cf262a..60deb3bf78eba010eaa67b50f56cb22d998e6e5c 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git apply for contextually independent diffs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 echo '1
index 4acb3f336ed3fac10c7ddf68868c3ff56db94978..71deaf779d5d73d7617c5ee960383309f087db7b 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='apply to deeper directory without getting fooled with symlink'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 3ecbef6f8e17578a5c0f1d6c015f4cdaddf20467..e1ffc048526748cd2b4be78fc389fae16fddaf11 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git am running'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup: messages' '
index b12b43e9e980f3c1fcdd032685a25f600bde169b..1f1a809c608343c7d018624f6dbcb79cbce073e4 100755 (executable)
@@ -22,6 +22,9 @@ test_description='git rerere
 ++++++ [master] initial
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 3d5c4a2086afbaa5f5ae275c957efb6ee809953b..ad6d3eebe5cf45acee057fce84bd1bf623cd4ab9 100755 (executable)
@@ -6,6 +6,9 @@
 test_description='git shortlog
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 56d34ed465bce63b7a2676f23b89c90cd51b8925..6c7a3cfc2c3fe2ee5432058bc6987c6a1a66153d 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git log'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 . "$TEST_DIRECTORY/lib-terminal.sh"
index 586c3a86b1d2cc08baf945eefe44a34efcd98ecf..8a2f8984f6225dfe7c6ef7764e4f29ec8b195fb6 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='.mailmap configurations'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 fuzz_blame () {
index 8ff8bd84c75e0fd4fd4c75e911b6abfca18a70fc..46ecb777f47c285d8b61c75f5d569fc9f64456ca 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git patch-id'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 60f040cab8ad5661b5b9b690798abba467748dd6..6c868df38d7ab5369b94f2da3b1a33399c1eee09 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Test for "git log --decorate" colors'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 6cdbe4747aa837376fd01c94420beb1bd1bb6d56..1938d4a58fa25c63382c79b0dd2b38167dda0cc9 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='magic pathspec tests using git-log'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 85d151423dedc363c83d6e168e33e0a612e70a6e..59c258429dbab0e3a09ffaa3af60fe5fe965aecf 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test log -L'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup (import history)' '
index a0803250984040733a327a9e347651c8686e5e0f..981b83513a5428735829b4d1b815414ab933c56a 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git log --graph of skewed left octopus merge.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-log-graph.sh
 
index d11040ce41c65d8bd2b5e14dda5b9044e18c6893..b3f3820dbbb7a6f545e7973bfe67cc1b929bbcaf 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git log for a path with Bloom filters'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 GIT_TEST_COMMIT_GRAPH=0
index 6e1b73ec3afcfff62ebe628cc673b236bc74e63d..ec7ba62d6704363aefc165ab112de84fda2752e3 100755 (executable)
@@ -6,6 +6,9 @@
 test_description='git-am mbox with dos line ending.
 
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Three patches which will be added as files with dos line ending.
index c1811ea0f4129447070a7650a0dd95a5b4ef9f46..752e1fb2d2a6625e057f8f5978c6de2857d38b31 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='Test workflows involving pull request.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq PERL
index df60f18fb8caa252a173603258ed09f9a3c2f89d..bd5f71e39697143a1f0d2b8135a665ebfdf7058a 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='prune'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 day=$((60*60*24))
index a5eca210b8963c4881fd8be858d13b88401b9888..2e56887ed545303782cdbc3e210a1e11f7d25e8c 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git pack-object --include-tag'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 TRASH=$(pwd)
index 8318781d2bbf6c345cda1fab26848771918f8a5a..7842eb0977303d1a4e0d87b20084a4bc08afa398 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='exercise basic bitmap functionality'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 objpath () {
index da9d59940d5aa72a059a36f4187775b093eb5a58..c70b5db2a09023d39e3c67cbc05ab278bd69eae3 100755 (executable)
@@ -8,6 +8,9 @@ bail out or to proceed using it as a reachable tip, but it is _not_
 OK to proceed as if it did not exist. Otherwise we might silently
 delete objects that cannot be recovered.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'disable reflogs' '
index dc0446574b3fe2bbc40b0a4d749ace8d868713ef..f19c521292a10522b5531a06fabedcd52d7499cf 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git pack-objects using object filtering'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Test blob:none filter.
index a581eaf52936292f28b2ff9542bccd8f2ea5152a..c92658d0268f078e0bc869fefc5c146bc0afe168 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='pack-objects object selection using sparse algorithm'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup repo' '
index cc86ef213ed0f146986aae3a33f526475d5e9b31..6be028f3e23c85eaa9d7e06f5c32a334f7e9735c 100755 (executable)
@@ -6,6 +6,9 @@
 test_description='See why rewinding head breaks send-pack
 
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 cnt=64
index 4aeea8f5b7ef0644c5944f13dd37544c6f9c00cc..27fc6ec4f36c2c64ea844d107de6bfbec46b9f04 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='Test the post-merge hook.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index a39b3b5c78bc900ae4e9c629598381f915d291de..ed91aadd95b240abfe6237d2e8b9aec13dbc93c7 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='Test the post-checkout hook.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 2762f420bc2c670b42eaefa0c1d33bc397fb4b2f..da37b22fc55b72fd72fd7547bf2fb4e6a6a26584 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='tracking branch update checks for git push'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 235fb7686ae0dec21e81b06dd0b220f0705a6b2e..1f5b33b562ad5b948e0300cb74c7d0dc81a29b5d 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='forced push to replace commit we do not have'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 80750a817e950848f11f334615c2a03b42afe286..78bffa64d76d51e2b2eaaebeace745e64118291e 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='Test the post-rewrite hook.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index f00d0da8606dbc26d6d45c987a763798d2187e31..30a4e6bb1aa9dafb5aaac8eef1868ae3becd3632 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git receive-pack with alternate ref filtering'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 355737431276bd1a8cd23a8439d754fcbd5f3512..4edb8c196eab5d62a8d89c082b6d04e3fa43fd7a 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Testing multi_ack pack fetching'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Test fetch-pack/upload-pack pair.
index 1bc57ac03f9df7e82fab5478b7234ab1435c60e3..96ce28b6ba7d9cf535ec36ca089adaf8c55772e8 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='fetch/push involving alternates'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 count_objects () {
index 7a46cbdbe687d080def03f41721fd0920ccd316f..e15a472e4c93c745ba60f8627ac1129acf658750 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test quickfetch from local'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 6041a4dd3278c7701f5e9dd46bfdab7ffbd0cc7a..cd1f4071743307b1eb7a66567d1f6aa49058e727 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test automatic tag following'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # End state of the repository:
index 1a16ac4c0dba9dde67230e15151c327ba9c916ed..7fe21b176d1814a9c72b292d7ffdb68cef565586 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='fetch/receive strict mode'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup and inject "corrupt or missing" object' '
index eaa6e9022048ade20043abdbecc40ba78f51b5bf..2b6e1f50f8210390b7268e8309df8e319b04d77d 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git remote porcelain-ish'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 setup_repository () {
index 83d5558c0ef0496e16e7c9f7a69cddc99cd11d86..bf3aa85da507752bd44dbe343bc05bf974d225bc 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git remote group handling'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 mark() {
index a67f792adf4a2fb846ade40eb26acfcb08ba5d1b..f234dba91a303077bab05dd2464821b72b131002 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='fetch/push involving ref namespaces'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 5d673358f9b79cda723a7013542bd8e7704ceb9c..4af490b6dbbeedc2433e2ca20e23ea847ae50bd1 100755 (executable)
@@ -5,6 +5,9 @@ test_description='Per branch config variables affects "git fetch".
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 D=$(pwd)
index e98c3a01741d8ed830d6342dd566b24eee25e8b6..a892807de202de71770a36a93a4dcc8f59f8d333 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git ls-remote'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 generate_references () {
index bd202ec6f31e4b4197d89deda06cb1485fdbc1f3..f12a83f82b9dacfcc6071f396cd86a72c941f989 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='fetch --all works correctly'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 setup_repository () {
index d11382f769f6669aa1f95e83a45fd266d4b9e304..70034675237fd971de8f7769cd4741ca93e6a881 100755 (executable)
@@ -14,6 +14,9 @@ This test checks the following functionality:
 * reflogs
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 D=$(pwd)
index e4edd56404fe636600e3f32eef754c7fb4b6b639..aa6405b45228fe897ddba258106bc97acded5163 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='pushing to a mirror repository'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 D=$(pwd)
index c2060bb870f35a3819fabb19c97e921e0ae43349..a94d0744d08d19d6d011e23020b9168222b49f91 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='fetch exit status test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 11fcd37700f372117145258f209e6c56ae04a1fc..0f199d0ccb0fe9134045656b5a29889cfe65a72b 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='push to a repository that borrows from elsewhere'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 9fae07cdfafab1a05354dfd41df3a5cf5cb3ce58..b6b21c6cd10186486b7133adc3768dbda73c64f0 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='pulling into void'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 modify () {
index db1a381cd91c3470b7007b747e3b3a82f4da162f..f0806f3eb58aff44ee6939202429540b014e5941 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='pull options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index e47b5db5d6603af4c63cf50a1aede28018ac564a..0e6c7c251bed98c717a6e2ee7b432cfb30aa98af 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='push with --set-upstream'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
index dd8e423d253b76bc3ee45dfece170423d3299a33..40fb276e0efddbef5b0737ccb2888213a72dd75c 100755 (executable)
@@ -3,6 +3,9 @@
 
 test_description='Recursive "git fetch" for submodules'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 pwd=$(pwd)
index 3b0cb98422930891548cb45344dd226911a8063f..4aa1fb7281cfed25cdb53379e6903c92612ec734 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test fetching of oddly-named refs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # afterwards we will have:
index f0a287d97dba8e2e72ed50f85d75df91852dab5f..b39b5171dc442191b843e416c834e0a9f2be3fb2 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='check various push.default settings'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup bare remotes' '
index 4ad059e6bedf8ddf2a0db9c20f70ee1c3cd6da15..010f5a020756bc0fb8e54bb771a0b377c5f2db0b 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test push with submodules'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 7813e8470e550a2eaf19943552fa69dfd4501747..a7f0f098dd5feeef9f021108a16ffb20a2623524 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='compare & swap push force/delete safety'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 setup_srcdst_basic () {
index af0385fb89bdc2711153546dc3bb876ecf630e50..6ab458684de88593e99906b1218383412d3f4d8b 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='signed push'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 
index a55202d2d34c516393a48e93a79256efb3d8c750..6de384a5ea16b5abadb89265ff368aaa987b2942 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='fetch/clone from a shallow clone'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 commit() {
index ecbf84d21c807a8d211c2068bd0a5d10deae4758..1253429d5df2b1a2c30cf4b7549e30295d7a566d 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='push from/to a shallow clone'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 commit() {
index 82aa99ae870e4064db0e335b43233ddd2b0e7173..1da2a7533ed9960b6e75f3b2e8373e2c175144ba 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='fetch/clone from a shallow clone over http'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
index 450321fddbbf6aeb90ec8a257fd657d28a32cbf9..751116e123c045e99ec0f4f8df94b9c2505c619e 100755 (executable)
@@ -7,6 +7,9 @@ test_description='test WebDAV http-push
 
 This test runs various sanity checks on http-push.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if git http-push > /dev/null 2>&1 || [ $? -eq 128 ]
index 187454f5dd93f412075a9744a33585744455107f..2836b872397be92ad41e71722914e1a3fb5e32a7 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='test smart pushing over http via http-backend'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 ROOT_PATH="$PWD"
index ddc1db722d43ce3cfbf80b46deea0a69a4973247..0feec9c44944f9bd39540b0f33fe0f5f451fd45b 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='push from/to a shallow clone over http'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
index 620c30d58f00b978bd20753acbf12181d5de2abe..16a8fc7535cfc3573ec9f40dd9af04c67381ba77 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='pushing to a repository using the atomic push option'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 mk_repo_pair () {
index 38e6f7340e74474b6899eff3543e7af31f1bf0cf..202d75aebebc90209ec2ffe2ffa662c63f88b441 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='pushing to a repository using push options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 mk_repo_pair () {
index 483578b2d75409798ae2697742fbf728c6383746..9ec91792c3e1fe07ef7dbc803fe2ce236be234cd 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test dumb fetching over http via static file'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
index e40e9ed52f17ce3cdb83bbcf5f2cd3cf1a3b2d8c..310b89dbab4987002167c57db3812c6d739e0f26 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test smart fetching over http via http-backend'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
index 7622981cbf25941260f5a7f21bd60f84cf8797f8..e78a21881fc0abbbf11f22b00c689d192b6afac8 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='"git fetch/pull --set-upstream" basic tests.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_config () {
index 9fafcf194589218e28b894a7bd9e83c9a1893fbf..5561b7d0121ef02ed15d907812d3ae46cab5450c 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test git-http-backend-noserver'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
index 6eb0294978a03f35f5c246a6000a92fc377b02ed..cba2dffdb0b3aa8db29422dfcdf7ccf7f3af48cf 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test git-http-backend'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 
index 8f69a7854fb3108e1301f4b90961b3f6a1dc9e98..2e99a331c5e167a2238f0aa1fcbf77355b954b25 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test fetching over git protocol'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-git-daemon.sh
index ac53d638695b69b67e18832846be8105864367de..971ed3da4bfc2414388243770060630c44fa45d7 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='check pre-push hooks'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Setup hook that always succeeds
index cf768b3a279004b9c182a4d8f3b7422e19e1c60d..da4c94cce1b686742bdbcdd31b22155b4922ffbd 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='various Windows-only path tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if test_have_prereq CYGWIN
index 927aad082098254d0ca31e96ba22310d044d8e3b..907bb062d671ca252cfd84f9e7cb8da7bf886aa3 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test GIT_CURL_VERBOSE'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
index 8c61e28fec85e9f4e534019e6a4928ed27b79eb9..608e9aa189a33c409bc33c3c7b61b06c1d5714a3 100755 (executable)
@@ -5,6 +5,9 @@ test_description='"git fetch" with negative refspecs.
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 7df3c5373ae605098b52fb8d2771ada81efbebee..e01c5fe02d81f947f3fb5e0b64df7516b87bdd21 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description=clone
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 X=
index 2f7be23044712ae832428fac09ad0a3cfd6a1fff..20fbb1e9a3db78d0f2ed8aae60a937c160affdf2 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='test clone --reference'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 base_dir=$(pwd)
index af23419ebfc15dc94fd3fa631ea72016ccf2104b..94028044b0e508dc8a6ce59491e5497b6a9f3e02 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test local clone'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 repo_is_hardlinked() {
index 7f082fb23b6af9292b279f9db129b8eb23a6e94b..3893a49e6d584906280423e2237892ef78fa9e6a 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='basic clone options'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 26985f4b44945f6680bfe2f65fb23d2c89407b6c..6e2e4adbb44eb5a94fbe3a1e0731aabda47603a9 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='some bundle related tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 6e7a7be052276613bf5f83551d93b4d90536ea4e..e4d5124f89ad11a7ec35af987c6eea5c08581b64 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='clone --branch option'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_HEAD() {
index 8b0d607df115235365d4ffb10f6a1bddbfa842b4..ba63ba8f42c1cb7a2cbce807633fb4450442c469 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test cloning a repository with detached HEAD'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 head_is_detached() {
index 8e0fd398236b5fd503565db7c2e266aef744476a..be4ae10c82fc144d10eae8ec8bf166d87317f4b0 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='tests for git clone -c key=value'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'clone -c sets config in cloned repo' '
index e3b436d8ae791c587e92ac8d665b189ed1f82220..9e37f7fef747a03d20d0361e19437058d4b6c13a 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test refspec written by clone-command'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index f4d49d833577c33f741adfb8e5ded0cdae2a4a8b..b2c3ed408853791cf30faed5a14b6926c6eadadf 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git partial clone'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # create a normal "src" repo where we can later create new commits.
index 1a041df10bee558bf4b643f42d4ffa876fefbc14..cba468fc538475495055f80282bb362e1d96612c 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='Test cloning repos with submodules using remote-tracking branches'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 pwd=$(pwd)
index 022901b9eb6fdcaf3ff625b0db8056047946aa1a..7f0056c1ed8ea259c280cbeed309ee592c7a5924 100755 (executable)
@@ -8,6 +8,9 @@ TEST_NO_CREATE_REPO=1
 GIT_TEST_PROTOCOL_VERSION=0
 export GIT_TEST_PROTOCOL_VERSION
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Test protocol v1 with 'git://' transport
index a1f5fdc9fdcf522706d4ad74230bff3887bbf9f9..66c47e61d814e3bd43d4ba4fc0ea087dd7f0637c 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test protocol v2 server commands'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'test capability advertisement' '
index 7d5b17909bb811148458f0566d624722f5cb8aff..f1f77fe089cdf0ddff9f8c628be01f0e5350c030 100755 (executable)
@@ -4,6 +4,9 @@ test_description='test git wire-protocol version 2'
 
 TEST_NO_CREATE_REPO=1
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Test protocol v2 with 'git://' transport
index b46940b725ba007102acc9a3046ba117beab56d4..c3a52d478f98e6c1a3752fa58aa577d1ee763ea1 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='upload-pack ref-in-want'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 get_actual_refs () {
index 0f04b6cddb723316b0edf1135086405a09e4205b..1ecefb57fe3614954e480cf036075178e6a24c5d 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Test remote-helper import and export commands'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 
index fc4d55dcb2e28d34b9a971f59872d30dfc87afcd..664000adf0d093cf85ab390b5a461f34a428038d 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='miscellaneous rev-list tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 7504ba47511bf5df27dd54d7090fdd920285db07..67c384f1e8218124e5791b8f4183cfc52c68036f 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='Revision traversal vs grafts and path limiter'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 3e8c42ee0b93cff3be39f42a411e9b32d16c5d5d..ff788199e3b54f21c7ddbacac0523f69226dac10 100755 (executable)
@@ -13,6 +13,9 @@ test_description='git rev-list trivial path optimization test
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 99a1eaf332db7120cd0e957a9316c30cd5c01594..bbbd577f108c98c2de0dc05c5d654e0686919725 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='git rev-list --pretty=format test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
index f0268372d25e562ad8fc5c347b376b88a62d8803..51547ac3a5969de97fecb7d0ad5c5cf0bc24c4aa 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test git rev-list --cherry-pick -- file'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # A---B---D---F
index c4af9ca0a7edf6230dc6ca8ec10848545971fce7..871ace31e2a565a0b787fde22b32490530cba184 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='git rev-list involving submodules that this repo has'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 916d9692bc05fdc87b28b7dbd4afdb173dd1d244..114f755d525c69fd4cc4b025419ccf7fb665f56b 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='ancestor culling and limiting by parent number'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_revlist () {
index fd202fcb9433451c5f0df412114eace11259e3f4..d163c24859fbbbc37cb37ebeea1746393fb2e9cc 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='merge simplification'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 note () {
index 89458d370f5f05d245ba57e430b7b97dd5880639..0298174956f4102db26bd0acd946f95c6379a2d6 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='--reverse combines with --parents'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
index f5e6e92f5b30cde2ddbaec3b53d47e67e1881908..3fb7ee0be48afe2dff7a458b316d59983ea91475 100755 (executable)
@@ -7,6 +7,9 @@
 
 test_description='--graph and simplified history'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'set up rev-list --graph test' '
index 667b37564e3d31ca060216e841b9a5d9e385c165..e51fe7b9bc16e39b164901a6c5f047577f85ed86 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='log family learns --stdin'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check () {
index fe2f3cec3d351987255ee25d2be37731f211889a..60a351c26a8bd99b749d43eee4aa6a40d9e2bd56 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='rev-list/rev-parse --glob'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 commit () {
index 353f84313f33b61c2f06d688cb9dfb75d8d4adf9..aeb7defaa31bf9213c838a8290702354ce8d13db 100755 (executable)
@@ -21,6 +21,9 @@ test_description='--ancestry-path'
 #  --ancestry-path G..M -- G.t == L
 #  --ancestry-path --simplify-merges G^..M -- G.t == G L
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_merge () {
index aa226381be214a43e7a07aa2ffe897314938184a..7dc65c73cd1882d2660df760a5a2c80307ddee55 100755 (executable)
@@ -6,6 +6,9 @@ test_description='Tests git bisect functionality'
 
 exec </dev/null
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 add_line_into_file()
index 50a934e1b2414f89173eced787bfe669229c70ed..bc95ff6f54cc4fc24140a1f1569e0d011026007e 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='remote tracking stats'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 advance () {
index c80dc10b8f12581842fd3ad09d1dc459e5addbdf..0a53462a614f66c29ec861aa30521f3ed9a30707 100755 (executable)
@@ -4,6 +4,9 @@
 #
 test_description='Tests replace refs functionality'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 
index 7531262a5e33d8a650879bf3316251a1062d1dc3..19a56f4a4df38f9e4fe89ca79befc095cf5dbf0b 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='Test git rev-parse with different parent options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_cmp_rev_output () {
index 656ac7fe9dc1074c5173bcfcf96503b65f33c2f5..69411862d6fab7a866b8e3d4dbe4cf1f18646297 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='operations that cull histories in unusual ways'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 4244638285bbf97a7e5f47e4efcd4bd3717cf49f..58b8d42bf3d1c06a6469ae7fafd5eaaae86b0795 100755 (executable)
@@ -13,6 +13,9 @@
 
 test_description='TREESAME and limiting'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 note () {
index de0e5a5d3646cdd7e60b98b566bb075200f311ad..5f39c3adb35f9bdaff1252d178ac71286c67a431 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git rev-list using object filtering'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Test the blob:none filter.
index f822d5d3285040f8a90fab1e7fa4e327196f60f2..360e65d3b985f2c17fc051a723aa3f014758f630 100755 (executable)
@@ -11,6 +11,9 @@ test_description='test describe'
 #
 # First parent of a merge commit is on the same line, second parent below.
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_describe () {
index f3e66eaf9bfe55cfa72a97461b23965013aa3d92..725b356d1e5fbfda4b25da96d67c8e83b8ed30fc 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='fmt-merge-msg test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 
index b359023189933e3dab334f22fce3d3ea35fd3701..b03740d6343c5757154cc82316699be5f314afa3 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='for-each-ref test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
index 0a21669f56d5706be75914f8e2ccaa754caf3040..0f3e6aa0119ba141443d5260421d7270ea68c6b7 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test for-each-refs usage of ref-filter APIs'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 
index 9da08382164dd2c0fe9d9b8d84c6b8450d161917..5fab2d2dd78f3b117c0d41c843bb07255e82cf11 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='Test merge with directory/file conflicts'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'prepare repository' '
index 3f64f62224485fec4e192b90dfacacb2c78f3626..227c2feb08d33cd3815dab99f36ea20d883a3a77 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Merge-recursive merging renames'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 modify () {
index b1c3d4dda49fc3c7d08e472217614469c76e9b9b..bdf81694560d60dcc287cb9106cc77b3cd43e6bc 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Test merge without common ancestors'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # This scenario is based on a real-world repository of Shawn Pearce.
index 6c0a90d044c52500fe1b1a31d2bf12eef9691de0..140e9e6ce63ab0e9b8da8f1cc93a950317359fb1 100755 (executable)
@@ -8,6 +8,9 @@ test_description='merging symlinks on filesystem w/o symlink support.
 This tests that git merge-recursive writes merge results as plain files
 if core.symlinks is false.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 76a55f838c4ac03cfba678c0f188f67d4f724e6a..7fe4034d58309fb52efe6d62622e2388e1b57506 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='per path merge controlled by merge attribute'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 4e6c7cb77e7dc42c9f21b8ca84f8a64b1ed7d3af..826deacfd70f8573b1e38e1ce4d05b25c3c90515 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='ask merge-recursive to merge binary files'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index b8e8b6f6429e85aa456370637ca3e8c5f9e32cfc..e2c1cfc9fe7f74c23db6885439b46654c449e766 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='subtree merge strategy'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 87741efad319237477541823637a8bf47c1a254d..7b66abfdbbc7a1c60641ac16f4833b9986a2b68a 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='merge: handle file mode'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'set up mode change in one branch' '
index 80777386dc6961b5114a85ea6efd14e066ebc9a4..d6840078c498d2a7b5a9ae29e01ccd963a41d8f6 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='merging with large rename matrix'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 count() {
index e8d65eefb521cc9f2e8211918734d069381772d4..3bd8e3e8995201c2a2600c278bb5c4b3eb6b089c 100755 (executable)
@@ -8,6 +8,9 @@ test_description='merge conflict in crlf repo
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index a25e7304604edd8866ad7f9b94a597174b8a5ae3..42824dcf49cfb38148ad6a0c0aad0b1f89d0f2bc 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Merge-recursive merging renames'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 2eddcc7664e82a8e6bdf35518876c8915e1f541a..32c0b624965c21241aa589bc4f0d8b439d275903 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='merging when a directory was replaced with a symlink'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'create a commit where dir a/b changed to symlink' '
index 887c2195a968160be064621cddf54f762e739a63..6a740771ed59d9a3e02bcfd741b8fd18ba1304f1 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='recursive merge corner cases involving criss-cross merges'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-merge.sh
 
index 0aebc6c028e06c8d98600ecbe37c0b0989a89bd8..e7883f890a18de02632c667488cda37ad6cb8161 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Merge-recursive ours and theirs variants'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index 30983d18b1bad5ff25f38317839493ac65bf71f5..91b43de00da2fbe4b42744c92f9db9db766bd5f9 100755 (executable)
@@ -12,6 +12,9 @@ test_description='CRLF merge conflict across text=auto change
 *+ [side^] Initial
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
index 531850d834dfa6f37d104afc12f3d5ddced8bf17..9996a94431b07ec2ee1d75e58d1ed35ccf641064 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git-merge with case-changing rename on case-insensitive file system'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq CASE_INSENSITIVE_FS
index 78bfaf17f077bba18bcd0525feec5620850528f2..70c8af7f513b5676a7a305575ae2c5f8fdedb7aa 100755 (executable)
@@ -3,6 +3,9 @@
 test_description="recursive merge corner cases w/ renames but not criss-crosses"
 # t6036 has corner cases that involve both criss-cross merges and renames
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-merge.sh
 
index f79d021590215f63b5699d985c4e058b98bb03a7..e58e3dfba13a03a5081d6a41eaedae1d4332c111 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Merge-recursive rename/delete conflict message'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'rename/delete' '
index f4655bb358ff7fa5c10427d49423fa5eb6849ab8..c192ee4e42810f7f628d62f6cbf6a8028987e5c5 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='recursive merge diff3 style conflict markers'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Setup:
index 9c08e63af250ddb8eb26d87ac10fafd080750311..acb2868260ffaf814639a33a6836b00abd9f111b 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='merge-recursive backend test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-merge.sh
 
index b56180ee4ad367d25666edb03268a2e841eb4d59..1333cbb14807af16ac5db3c27159300f7a238564 100755 (executable)
@@ -11,6 +11,9 @@ test_description='merge-recursive space options
 *   ok 1: setup
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
index e29c284b9b9b06a333c9e6d8b5240821403275b3..2d51b2d08c1e3eae4ff8d2d2298ccc76b93e7b1c 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='"git merge" top-level frontend'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 t3033_reset () {
index 3d9fae68c41c85b4393e618cfe3706212d5c2dce..7e877e96e2289fae6d5a321fb51634f357cba687 100755 (executable)
@@ -26,6 +26,9 @@ they are rounded down (see, e.g., Documentation/diff-generate-patch.txt, which
 mentions this in a different context).
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 get_expected_stages () {
index dd9376842fecf7ebd3706f0c79e5b9a1308b4ea7..7d5691c1b47feece163070bc4ed5f5b72ccd4fe7 100755 (executable)
@@ -4,6 +4,9 @@ test_description='git-merge
 
 Do not overwrite changes.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 3ead2b726f4b3fac9060c53721471858d59c1e4a..14fa46edf31cbba8eaa0ff8ddb40b0d39f851742 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='merging with submodules'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 #
index 5c8894d94ff107b6ea9ca63226075fadf9501e55..e5542ceb2434f84755fc083e7658da08815b4656 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='unpack-trees error messages'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
index 8a3bb4105bf9412b730158ebb55ed268e749a812..bda5069044f10b5e7a98362baf0f78ec5026e448 100755 (executable)
@@ -25,6 +25,9 @@
 #      to refer to an existing tree).
 
 test_description='check pruning of dependent objects'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # We care about reachability, so we do not want to use
index 36477cb1f4470055726cc89d1e69af5f60d88bd2..db496fa0391cd8014efe6d1308acdbe062679754 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git filter-branch'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 
index 05f411c82130e644a15782896f95ea41bba6f6c8..0e3086c4a64c79abf30ab12bd0f782f8ef317150 100755 (executable)
@@ -7,6 +7,9 @@ test_description='git tag
 
 Tests for operations with tags.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
index 5c5bc32ccb13ac77b453a90e432c74f3ed331ac1..bcb3c4f0350ec2cd478b73ebec2b6a4c24c386d4 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='signed tag tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 
index d5218743e963bd7e68788946c686e0a45c7d8a2f..e65ca019eb02f7b2e5d80a2bfcda780e964fa84e 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='basic work tree status reporting'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index a682a3d826e9dedcf3a08df7a510f6973a42bb8b..ae60942347796d2d3786522d8946e26829cccd48 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='test untracked cache'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # On some filesystems (e.g. FreeBSD's ext2 and ufs) directory mtime
index 537787e598b414886316d497c0076d517a654be8..07954b214216c6dd7fb62630330933b2fa279aab 100755 (executable)
@@ -5,6 +5,9 @@ test_description='git status --porcelain=v2
 This test exercises porcelain V2 output for git status.'
 
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
index b1affb001f599cbfdc074d2a19bf8816a76c4c32..4af43d26f1f4eff803ba9f8748e04240e98753b2 100755 (executable)
@@ -7,6 +7,9 @@ test_description='git reset
 
 Documented tests for git reset'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 commit_msg () {
index f011ad7eece890ef6ea74b7f55df95b636597b4f..8872c32f942eb06e2caa469d2d2c9d71948a0ea0 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='post index change hook'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index b36a93056fd8ea5b0fc489d92c3bacf3633c3498..12567543c42571613f3d4f261f7cb8b75c222592 100755 (executable)
@@ -20,6 +20,9 @@ Test switching across them.
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_tick
index fec7e0299dec2614cad243c2520423fe56ce6605..8addc0c8c9d077bb11d95f3e4f8f74b0cb9c505a 100755 (executable)
@@ -9,6 +9,9 @@ This test tries to verify basic sanity of the init, update and status
 subcommands of git submodule.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'submodule deinit works on empty repository' '
index 0726799e74e7a587e920c35f356b3364737b70d2..c95559bed5d5417430bdc2663f4b79bb6198ae77 100755 (executable)
@@ -8,6 +8,9 @@ test_description='git submodule sync
 These tests exercise the "git submodule sync" subcommand.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
index acb8766ac260a6d85f1806bdc65c01d9c79013ba..825b1a7e0cc341157dc8e8e82d9b9b26c26675ba 100755 (executable)
@@ -9,6 +9,9 @@ This test verifies that "git submodule update" detaches the HEAD of the
 submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
index 6b2aa917e11871eb403c8c79725b1e1944f8d29f..632defc53bf9299e2d3f0937a900c1e4299553da 100755 (executable)
@@ -9,6 +9,9 @@ This test verifies that "git submodule foreach" correctly visits all submodules
 that are currently checked out.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
index fc018e3638a8bebebf0f1c689567e9867bfbbee8..e9428e2b593ec003bbef10d98543f8ddc914a515 100755 (executable)
@@ -10,6 +10,9 @@ on detached working trees
 '
 
 TEST_NO_CREATE_REPO=1
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'submodule on detached working tree' '
index f7e7e94d7b6cfec6c625f6830b296b276572df66..0a514e951c564186d4c0b3d80ef66ffdd093173e 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='check handling of .gitmodule path with dash'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'create submodule with dash in path' '
index 110b4bf459bf90428dfd5ea0b919004d229bbe41..9a1414f31d48940caf6beaba7d50ca2183a5fb4d 100755 (executable)
@@ -7,6 +7,9 @@
 # signoff
 
 test_description='git commit'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/diff-lib.sh"
 
index 14c92e4c25c254e1037033b32e2c38afe90e811b..c8c16bf1c9ebb344a35a6b411196d68808fda3c2 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git commit porcelain-ish'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 commit_msg_is () {
index b3485450a2059d0fefbc18d098a87aa03705ed66..8d3f4ab0d78198df114ac5d36804f0a8736ae29a 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='pre-commit and pre-merge-commit hooks'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 HOOKDIR="$(git rev-parse --git-dir)/hooks"
index 31b9c6a2c1d3c30aa7d6d8a2eb836e7b67831d0c..17fb1d8499ebcc6f7065f59d81c1d95b0c5c7638 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='commit-msg hook'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'with no hook' '
index 94f85cdf831790a27ac2878bf483a6a0c0f1c441..978c90abbbbc341355d164638cc94bd1320959fa 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='prepare-commit-msg hook'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'set up commits for rebasing' '
index 6baaa1ad91d4e51364afb12e62be6a1b48f2ea74..a5a36cab85faa1ba0c25c5994cf66123124c62ff 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='signed commit tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 GNUPGHOME_NOT_USED=$GNUPGHOME
 . "$TEST_DIRECTORY/lib-gpg.sh"
index 29518e0949bfc83582c882c67c54bb56f1f0698a..fbd760f7e63132cfad0fcc0882bb9b466ee85ebf 100755 (executable)
@@ -7,6 +7,9 @@
 
 test_description='git status advice'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
index b2401cec3e3be01d0973dea72f8154b5824762aa..344d72a5c0e828c09430244b7b76c31300436895 100755 (executable)
@@ -6,6 +6,9 @@
 
 test_description='per-repo forced setting of email address'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup a likely user.useConfigOnly use case' '
index 1c85f7555507695b301428b7aabea3b65a199b40..0ad866c08c34b4fd93d2367df6f3571141bb0519 100755 (executable)
@@ -26,6 +26,9 @@ Testing basic merge operations/option parsing.
 +++++++* [c0] commit 0
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 
index 8e7e0a5865d762c1cb859154c2d4735b9bf8722b..7059c2a54b5c703c3f18f47962df496465320bfc 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test auto-generated merge messages'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_oneline() {
index 70afdd06fa7208a20ac66f1eb6e9e3690d5fe528..e65645d5e91c2ef6181cc2d60b249e8f26b40c26 100755 (executable)
@@ -7,6 +7,9 @@ test_description='git mergetool
 
 Testing basic merge tool invocation'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # All the mergetool test work by checking out a temporary branch based
index 7c84a518aa398cef2f7f39e23e02a9160323d968..ed072bfb19a1b8150bbf6d175dc369237f3ef366 100755 (executable)
@@ -22,6 +22,9 @@ Next, test git merge --abort with the following variables:
 - changed/unchanged worktree after merge
 - changed/unchanged index after merge
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index a426f3a89aa76fb9b89464988211264e56314a60..b4ec88f9961fd476101eee7dc0a6e276478b7ccf 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='merge signature verification tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 
index c1b8446f491dcec38671901c508f2471a9c59d3f..ea4eeee35f74ffc37e53045991f4d33a66f56e11 100755 (executable)
@@ -5,6 +5,9 @@ test_description='git merge --signoff
 This test runs git merge --signoff and makes sure that it works.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Setup test files
index 48261ba0805cd21e64bdf471f2835a7075782a6c..375f43a721ae8c37c38a6899b3093c84996867b0 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git repack works correctly'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 fsha1=
index a578b35761f2e97177dd8342ff5d949e719b64d3..f938efa296eddfad060d74675a3400b9a9c34b35 100755 (executable)
@@ -8,6 +8,9 @@ test_description='git-difftool
 Testing basic diff tool invocation
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 difftool_test_setup ()
index 991d5bd9c03f525d536770908269209d716f39c1..47ec993962155d17ad4250d10bf2985a88a17045 100755 (executable)
@@ -6,6 +6,9 @@
 test_description='git grep various.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 cat >hello.c <<EOF
index 72176e42c1d188f03f319b5a9acd954c5fe8ab6a..f661007c85e14f7e21db76fe48fbbab8046324e8 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git annotate'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 PROG='git annotate'
index 015973e8fe227e91f9dff8f9c6b08d298670f1ac..89a319d2c779885d03fb3e1e214fb922f3cfa7ef 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git blame'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 PROG='git blame -c'
index ba8013b00285afd7f43e7090284e52fa8921224d..0613d889dbe2ebd9590f8847277ed22cad2f4894 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git blame corner cases'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 pick_fc='s/^[0-9a-f^]* *\([^ ]*\) *(\([^ ]*\) .*/\1-\2/'
index 9c353ab22276c052de054281dd57808d1826a355..ffce1d1195edd7b7fc487e9a53cec466eec7e8a1 100755 (executable)
@@ -3,6 +3,9 @@
 # Based on a test case submitted by Björn Steinbrink.
 
 test_description='git blame on conflicted files'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup first case' '
index ed38f74de95c92b358cc9a27d2470e890b9bdbb3..d55b3e22c92509ae0153ba97f10ee07d53bc80c1 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='colored git blame'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 PROG='git blame -c'
index a08f72596ab4f622033c820f6251ccea92e38d11..3d160d939e352a5a8cd49bd9bee07d92a37bb37f 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git send-email'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # May be altered later in the test
index e4bb22034ee63d92d8a304f3e9754df9ec4131b8..9a6f2c38f1b75db65c4ec85120a481f5cf7baef7 100755 (executable)
@@ -6,6 +6,9 @@
 test_description='git svn basic tests'
 GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 case "$GIT_SVN_LC_ALL" in
index 3bbf341f6a5b176a96bb00c5644d294e13c0cc43..053571ca5c0bf291c095047f5bb6a766f7913a1e 100755 (executable)
@@ -3,6 +3,9 @@
 # Copyright (c) 2009 Eric Wong
 #
 test_description='git svn initial master branch is "trunk" if possible'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 test_expect_success 'setup test repository' '
index 4f6c06ecb2bc8671949326955acf3ff39a364c5d..9188c761de39f43e3678bca94b0553b4215a80ad 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='git-svn svn mergeinfo properties'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 test_expect_success 'load svn dump' "
index 184336f34611c7b10da936ca0b78bb5e77afb77f..9d6cc40addf21de921c9b1355d74b58b429cf559 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git svn fetch deleted tag'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 test_expect_success 'setup svn repo' '
index 7a6e33ba3c50a2c1ed153664e18649043a96c048..ba78bfb676ffa375b68625b8d021f40d9d697c70 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git svn fetch deleted tag 2'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 test_expect_success 'setup svn repo' '
index d6245cee081059d98e72758a3ff7bb42730a7662..e48faf92afab8ad3e8227f96d27ec669979b0544 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='git svn reset clears memoized caches'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 svn_ver="$(svn --version --quiet)"
index 54b1f61a2a7431976da348f3dabf9ec41c179521..47ae51c54fbca57a28a0999e62dcd529ea8e3b97 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git svn dcommit CRLF'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 test_expect_success 'setup commit repository' '
index 308c1ef42cd10423767449ce33fa0c3d0cfadc31..404a42999eafb9a2f8b34b0fe5e155bec03b329f 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='test git fast-import utility'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
 
index 14c1baa73940e716a3ca2b76c38c80a643b3af54..0c5bfbde0ed3e29377fd06847ccea4bf6e2799c3 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='test git fast-import of notes objects'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
index 137284255998ddd2653360cf614b265ead14d391..6c8830ece58de425c11b4317d50b59733d486ea8 100755 (executable)
@@ -4,6 +4,9 @@
 #
 
 test_description='git fast-export'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
index 5ac2c3b5eef0657e25418b4a6656b7e63edd8821..4130c8a8377545cfecc7303692cfc8923292794a 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='basic tests for fast-export --anonymize'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup simple repo' '
index 4a46f31c41933e7d2e5c72e47aebf5abd9d7bb3e..7d23e6ba943eb54bda6a9c9012ea360257b127ff 100755 (executable)
@@ -8,6 +8,9 @@ test_description='git-cvsserver access
 tests read access to a git repository with the
 cvs CLI client via git-cvsserver server'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq PERL; then
index c7a0dd84a4b8b8145b498ab1fa9cd8d82300c9c5..0062341dbf156e022288045662db3825a71acc04 100755 (executable)
@@ -9,6 +9,9 @@ test_description='git-cvsserver -kb modes
 tests -kb mode for binary files when accessing a git
 repository using cvs CLI client via git-cvsserver server'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 marked_as () {
index 6436c91a3cb73be56ee2e972b64fdaf5a386ee5e..33b6db1648216e68480a2c0cb7a46d2e055d28c9 100755 (executable)
@@ -5,6 +5,9 @@ test_description='git-cvsserver and git refspecs
 tests ability for git-cvsserver to switch between and compare
 tags, branches and other git refspecs'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 #########
index b484e3e25020c4feb06760accd55a1bd07db63b5..fa36bf5e83e419c23a7edfab20df1d802b22f7ae 100755 (executable)
@@ -10,6 +10,9 @@ commandline, and checks that it would not write any errors
 or warnings to log.'
 
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./gitweb-lib.sh
 
 # ----------------------------------------------------------------------
index 2a0ffed870dd8634466bccfd0e435b5a304f8818..6b0adf28d280ae340b6ec80818c23ce467005dbb 100755 (executable)
@@ -10,6 +10,9 @@ commandline, and checks that it returns the expected HTTP status
 code and message.'
 
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./gitweb-lib.sh
 
 #
index e38cbc97d38e41ae8bdf5c8d11695e06257dfa0b..76d90eccd8c29d7f82b676d8eec1c31110c1b20e 100755 (executable)
@@ -10,6 +10,9 @@ commandline, and checks that it produces the correct output, either
 in the HTTP header or the actual script output.'
 
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./gitweb-lib.sh
 
 # ----------------------------------------------------------------------
index 251fdd66c47b5e378cf091a47ba1f804eb74c487..9257d664f20174f8baa4c8f9262dbc7d995839ed 100755 (executable)
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git cvsimport basic tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-cvs.sh
 
 if ! test_have_prereq NOT_ROOT; then
index 827d39f5bf28652cc3d9fdf2f331592ed0b46ecc..700c2688d2c777f9d372b81fa2622637168780c3 100755 (executable)
@@ -32,6 +32,9 @@
 #       tag has been removed.
 
 test_description='git cvsimport handling of vendor branches'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-cvs.sh
 
 setup_cvs_test_repository t9601
index e1db323f545fccfdadbf2bc1df1060e006674298..7b1fb36e67d103f9b661217863a4196336a3ff0b 100755 (executable)
@@ -4,6 +4,9 @@
 # t9602/README.
 
 test_description='git cvsimport handling of branches and tags'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-cvs.sh
 
 setup_cvs_test_repository t9602
index e7a91611dcf1ad6a30b7a4b3421f204e12497f32..87cd8c0c6be4661716c353b2e8c5c48d64fe2d13 100755 (executable)
@@ -12,6 +12,9 @@
 # bug.
 
 test_description='git cvsimport testing for correct patchset estimation'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-cvs.sh
 
 setup_cvs_test_repository t9603
index c98c1dfc2308e0affc48d5c2e133b6e5d24e9283..c920b8477878aa38926c7590c7c212c5107646a4 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git p4 tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-p4.sh
 
 test_expect_success 'start p4d' '
index a3abd778f93164ed35d169d8cbb37d9ab82b628a..ebfe9d819513a4ff9bb5fbb0887f90b513757a81 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git p4 tests for p4 branches'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-p4.sh
 
 test_expect_success 'start p4d' '
index 4e794a01bf556f97f94eaabf8cc259f333c75049..c7629b6c7d7b33041ecfdae6aa31b5c3913742d5 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git p4 options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-p4.sh
 
 test_expect_success 'start p4d' '
index eaaae414a1ff22d127a51f047716800a8585d87a..f12e6f72068fc7617feb07d9cecca45759e6d194 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git p4 submit'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-p4.sh
 
 test_expect_success 'start p4d' '
index c1446f26aba59e19b1610652a1db449e8bddca92..c53952ac14303ed68bdee508823cef85fe3d7c8f 100755 (executable)
@@ -2,6 +2,9 @@
 
 test_description='git p4 label tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-p4.sh
 
 test_expect_success 'start p4d' '
index 2be9190425bb1dc6f9ab0eb1b8e030c99e0d2920..50bf93dd81f42e152e7ded26ebb7644d2bb0022d 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='test bash completion'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-bash.sh
 
 complete ()
index ab5da2cabc400a7a3102bd962a60a08629f4d535..f5b5935c2c03acb59382d8a447ea3365f54dfa2c 100755 (executable)
@@ -5,6 +5,9 @@
 
 test_description='test git-specific bash prompt functions'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-bash.sh
 
 . "$GIT_BUILD_DIR/contrib/completion/git-prompt.sh"