From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C49AC5519F for ; Wed, 18 Nov 2020 23:45:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 622A2246BB for ; Wed, 18 Nov 2020 23:45:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lknhRnpU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727406AbgKRXo4 (ORCPT ); Wed, 18 Nov 2020 18:44:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726739AbgKRXoy (ORCPT ); Wed, 18 Nov 2020 18:44:54 -0500 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA100C0617A7 for ; Wed, 18 Nov 2020 15:44:53 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id p8so4327271wrx.5 for ; Wed, 18 Nov 2020 15:44:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=fU0zbvBeoP9qbp1hNOaCjHZkryORAnoEaSqnYLdcKVg=; b=lknhRnpUN/ZhPruzkuMX1yi31/SxI8qqbckJMxHH+/M2SK3dplpxtzh6gM5FeMCPfZ LZgbzFpxZANS0O7qdoGS6alVWYUZNB1TkVWdBkR9Rfxrxma2HAtfWcaB3ynj9uXKq3qE yh0maLabBe8KsmM1gA+nQlcCJNWogPcXCoYZfh/4IvfA4rMSrGm8wienmcDyZKq3bFJU Jy+wtwzg67e0+WU+DYnJ4r7Uj+bMb/Js5goYaTU8s8J0/z3IUFx4uKQWgzCZ5em4y3i6 GofvApDv7Aodff7yWCg/UfM+Aq6RVkKG4KoIFGGfQ2XZesvbNgiqgy1SgT8WtP+UxHve 6m0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=fU0zbvBeoP9qbp1hNOaCjHZkryORAnoEaSqnYLdcKVg=; b=Hj7JyH1QkgZuf7vXTBxGp7UzH6zMk12McVI9CDcI7Ro7Qpp7AW7Oj5beoinykYmwIu HyxKs4BRemBvNRvIy5x7ujcXLU6/6wzsJcBgAsGx2fH8U/99uUjC/w4nBrFx16cE1avN mwBreEmBQ0EzcHw4iwGzFH1UiBflUxNlf0x+EV4sKFymSwYe4rcaZ0NtYZC5alGX0DLh MhGHfRJ706KEBraOp/CuWLFbjrLwHKTtXVGmbKcxl5AgQS1dorxeAcuZvlIkCL1azLbt Dcbg5vI4hM8VpmGJMAN6u33bJAdGYOX3ar9KyKskCxl+cR4xpVMHAySm0xqCMkY73XQl Sd2Q== X-Gm-Message-State: AOAM532b+gMyO9sacL2KI/LW8TJb2afheAsPrataMiDbyVWUO86ystQT rkhY7iWaWfqpErp6FkkI2Ca6mlch/A8= X-Google-Smtp-Source: ABdhPJwk/rlxXm40Qye/aoDsDYDPc2McKdF2/lYl4eMjHUK+JBFrI4SRMkoZL+1ZLBpd9yIc89a+xA== X-Received: by 2002:a5d:4e0a:: with SMTP id p10mr7527931wrt.358.1605743091205; Wed, 18 Nov 2020 15:44:51 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s2sm6136976wmh.37.2020.11.18.15.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 15:44:50 -0800 (PST) Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Wed, 18 Nov 2020 23:44:19 +0000 Subject: [PATCH v3 01/28] tests: mark tests relying on the current default for `init.defaultBranch` Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Felipe Contreras , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Johannes Schindelin , Jeff King , Jonathan Nieder , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin 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 --- ci/run-build-and-tests.sh | 2 ++ t/t0002-gitfile.sh | 3 +++ t/t0020-crlf.sh | 3 +++ t/t0021-conversion.sh | 3 +++ t/t0028-working-tree-encoding.sh | 3 +++ t/t0041-usage.sh | 3 +++ t/t0050-filesystem.sh | 3 +++ t/t0100-previous.sh | 3 +++ t/t1004-read-tree-m-u-wf.sh | 3 +++ t/t1008-read-tree-overlay.sh | 3 +++ t/t1009-read-tree-new-index.sh | 3 +++ t/t1021-rerere-in-workdir.sh | 3 +++ t/t1090-sparse-checkout-scope.sh | 3 +++ t/t1091-sparse-checkout-builtin.sh | 3 +++ t/t1300-config.sh | 3 +++ t/t1301-shared-repo.sh | 3 +++ t/t1400-update-ref.sh | 3 +++ t/t1403-show-ref.sh | 3 +++ t/t1405-main-ref-store.sh | 3 +++ t/t1406-submodule-ref-store.sh | 3 +++ t/t1407-worktree-ref-store.sh | 3 +++ t/t1408-packed-refs.sh | 3 +++ t/t1410-reflog.sh | 3 +++ t/t1411-reflog-show.sh | 3 +++ t/t1413-reflog-detach.sh | 3 +++ t/t1414-reflog-walk.sh | 3 +++ t/t1416-ref-transaction-hooks.sh | 3 +++ t/t1430-bad-ref-name.sh | 3 +++ t/t1500-rev-parse.sh | 3 +++ t/t1503-rev-parse-verify.sh | 3 +++ t/t1505-rev-parse-last.sh | 3 +++ t/t1506-rev-parse-diagnosis.sh | 3 +++ t/t1507-rev-parse-upstream.sh | 3 +++ t/t1508-at-combinations.sh | 3 +++ t/t1511-rev-parse-caret.sh | 3 +++ t/t1512-rev-parse-disambiguation.sh | 3 +++ t/t1513-rev-parse-prefix.sh | 3 +++ t/t1514-rev-parse-push.sh | 3 +++ t/t1700-split-index.sh | 3 +++ t/t2007-checkout-symlink.sh | 3 +++ t/t2009-checkout-statinfo.sh | 3 +++ t/t2010-checkout-ambiguous.sh | 3 +++ t/t2011-checkout-invalid-head.sh | 3 +++ t/t2012-checkout-last.sh | 3 +++ t/t2015-checkout-unborn.sh | 3 +++ t/t2017-checkout-orphan.sh | 3 +++ t/t2020-checkout-detach.sh | 3 +++ t/t2022-checkout-paths.sh | 3 +++ t/t2023-checkout-m.sh | 3 +++ t/t2027-checkout-track.sh | 3 +++ t/t2030-unresolve-info.sh | 3 +++ t/t2060-switch.sh | 3 +++ t/t2070-restore.sh | 3 +++ t/t2400-worktree-add.sh | 3 +++ t/t2401-worktree-prune.sh | 3 +++ t/t2402-worktree-list.sh | 3 +++ t/t2405-worktree-submodule.sh | 3 +++ t/t3200-branch.sh | 3 +++ t/t3201-branch-contains.sh | 3 +++ t/t3202-show-branch-octopus.sh | 3 +++ t/t3203-branch-output.sh | 3 +++ t/t3204-branch-name-interpretation.sh | 3 +++ t/t3205-branch-color.sh | 3 +++ t/t3206-range-diff.sh | 3 +++ t/t3210-pack-refs.sh | 3 +++ t/t3211-peel-ref.sh | 3 +++ t/t3302-notes-index-expensive.sh | 3 +++ t/t3303-notes-subtrees.sh | 3 +++ t/t3304-notes-mixed.sh | 3 +++ t/t3320-notes-merge-worktrees.sh | 3 +++ t/t3400-rebase.sh | 3 +++ t/t3402-rebase-merge.sh | 3 +++ t/t3403-rebase-skip.sh | 3 +++ t/t3404-rebase-interactive.sh | 3 +++ t/t3405-rebase-malformed.sh | 3 +++ t/t3406-rebase-message.sh | 3 +++ t/t3407-rebase-abort.sh | 3 +++ t/t3408-rebase-multi-line.sh | 3 +++ t/t3409-rebase-preserve-merges.sh | 3 +++ t/t3412-rebase-root.sh | 3 +++ t/t3413-rebase-hook.sh | 3 +++ t/t3415-rebase-autosquash.sh | 3 +++ t/t3416-rebase-onto-threedots.sh | 3 +++ t/t3418-rebase-continue.sh | 3 +++ t/t3419-rebase-patch-id.sh | 3 +++ t/t3420-rebase-autostash.sh | 3 +++ t/t3427-rebase-subtree.sh | 3 +++ t/t3430-rebase-merges.sh | 3 +++ t/t3431-rebase-fork-point.sh | 3 +++ t/t3432-rebase-fast-forward.sh | 3 +++ t/t3434-rebase-i18n.sh | 3 +++ t/t3435-rebase-gpg-sign.sh | 3 +++ t/t3500-cherry.sh | 3 +++ t/t3501-revert-cherry-pick.sh | 3 +++ t/t3502-cherry-pick-merge.sh | 3 +++ t/t3503-cherry-pick-root.sh | 3 +++ t/t3504-cherry-pick-rerere.sh | 3 +++ t/t3505-cherry-pick-empty.sh | 3 +++ t/t3506-cherry-pick-ff.sh | 3 +++ t/t3507-cherry-pick-conflict.sh | 3 +++ t/t3508-cherry-pick-many-commits.sh | 3 +++ t/t3509-cherry-pick-merge-df.sh | 3 +++ t/t3512-cherry-pick-submodule.sh | 3 +++ t/t3600-rm.sh | 3 +++ t/t3701-add-interactive.sh | 3 +++ t/t3901-i18n-patch.sh | 3 +++ t/t3903-stash.sh | 3 +++ t/t3910-mac-os-precompose.sh | 3 +++ t/t4013-diff-various.sh | 3 +++ t/t4014-format-patch.sh | 3 +++ t/t4017-diff-retval.sh | 3 +++ t/t4038-diff-combined.sh | 3 +++ t/t4041-diff-submodule-option.sh | 3 +++ t/t4048-diff-combined-binary.sh | 3 +++ t/t4052-stat-output.sh | 3 +++ t/t4056-diff-order.sh | 3 +++ t/t4057-diff-combined-paths.sh | 3 +++ t/t4061-diff-indent.sh | 3 +++ t/t4066-diff-emit-delay.sh | 3 +++ t/t4068-diff-symmetric-merge-base.sh | 3 +++ t/t4103-apply-binary.sh | 3 +++ t/t4108-apply-threeway.sh | 3 +++ t/t4121-apply-diffs.sh | 3 +++ t/t4122-apply-symlink-inside.sh | 3 +++ t/t4150-am.sh | 3 +++ t/t4200-rerere.sh | 3 +++ t/t4201-shortlog.sh | 3 +++ t/t4202-log.sh | 3 +++ t/t4203-mailmap.sh | 3 +++ t/t4204-patch-id.sh | 3 +++ t/t4207-log-decoration-colors.sh | 3 +++ t/t4208-log-magic-pathspec.sh | 3 +++ t/t4211-line-log.sh | 3 +++ t/t4214-log-graph-octopus.sh | 3 +++ t/t4216-log-bloom.sh | 3 +++ t/t4253-am-keep-cr-dos.sh | 3 +++ t/t5150-request-pull.sh | 3 +++ t/t5304-prune.sh | 3 +++ t/t5305-include-tag.sh | 3 +++ t/t5310-pack-bitmaps.sh | 3 +++ t/t5312-prune-corruption.sh | 3 +++ t/t5317-pack-objects-filter-objects.sh | 3 +++ t/t5322-pack-objects-sparse.sh | 3 +++ t/t5400-send-pack.sh | 3 +++ t/t5402-post-merge-hook.sh | 3 +++ t/t5403-post-checkout-hook.sh | 3 +++ t/t5404-tracking-branches.sh | 3 +++ t/t5405-send-pack-rewind.sh | 3 +++ t/t5407-post-rewrite-hook.sh | 3 +++ t/t5410-receive-pack-alternates.sh | 3 +++ t/t5500-fetch-pack.sh | 3 +++ t/t5501-fetch-push-alternates.sh | 3 +++ t/t5502-quickfetch.sh | 3 +++ t/t5503-tagfollow.sh | 3 +++ t/t5504-fetch-receive-strict.sh | 3 +++ t/t5505-remote.sh | 3 +++ t/t5506-remote-groups.sh | 3 +++ t/t5509-fetch-push-namespaces.sh | 3 +++ t/t5510-fetch.sh | 3 +++ t/t5512-ls-remote.sh | 3 +++ t/t5514-fetch-multiple.sh | 3 +++ t/t5516-fetch-push.sh | 3 +++ t/t5517-push-mirror.sh | 3 +++ t/t5518-fetch-exit-status.sh | 3 +++ t/t5519-push-alternates.sh | 3 +++ t/t5520-pull.sh | 3 +++ t/t5521-pull-options.sh | 3 +++ t/t5523-push-upstream.sh | 3 +++ t/t5526-fetch-submodules.sh | 3 +++ t/t5527-fetch-odd-refs.sh | 3 +++ t/t5528-push-default.sh | 3 +++ t/t5531-deep-submodule-push.sh | 3 +++ t/t5533-push-cas.sh | 3 +++ t/t5534-push-signed.sh | 3 +++ t/t5537-fetch-shallow.sh | 3 +++ t/t5538-push-shallow.sh | 3 +++ t/t5539-fetch-http-shallow.sh | 3 +++ t/t5540-http-push-webdav.sh | 3 +++ t/t5541-http-push-smart.sh | 3 +++ t/t5542-push-http-shallow.sh | 3 +++ t/t5543-atomic-push.sh | 3 +++ t/t5545-push-options.sh | 3 +++ t/t5550-http-fetch-dumb.sh | 3 +++ t/t5551-http-fetch-smart.sh | 3 +++ t/t5553-set-upstream.sh | 3 +++ t/t5560-http-backend-noserver.sh | 3 +++ t/t5561-http-backend.sh | 3 +++ t/t5570-git-daemon.sh | 3 +++ t/t5571-pre-push-hook.sh | 3 +++ t/t5580-unc-paths.sh | 3 +++ t/t5581-http-curl-verbose.sh | 3 +++ t/t5582-fetch-negative-refspec.sh | 3 +++ t/t5601-clone.sh | 3 +++ t/t5604-clone-reference.sh | 3 +++ t/t5605-clone-local.sh | 3 +++ t/t5606-clone-options.sh | 3 +++ t/t5607-clone-bundle.sh | 3 +++ t/t5609-clone-branch.sh | 3 +++ t/t5610-clone-detached.sh | 3 +++ t/t5611-clone-config.sh | 3 +++ t/t5612-clone-refspec.sh | 3 +++ t/t5616-partial-clone.sh | 3 +++ t/t5617-clone-submodules-remote.sh | 3 +++ t/t5700-protocol-v1.sh | 3 +++ t/t5701-git-serve.sh | 3 +++ t/t5702-protocol-v2.sh | 3 +++ t/t5703-upload-pack-ref-in-want.sh | 3 +++ t/t5801-remote-helpers.sh | 3 +++ t/t6000-rev-list-misc.sh | 3 +++ t/t6001-rev-list-graft.sh | 3 +++ t/t6004-rev-list-path-optim.sh | 3 +++ t/t6006-rev-list-format.sh | 3 +++ t/t6007-rev-list-cherry-pick-file.sh | 3 +++ t/t6008-rev-list-submodule.sh | 3 +++ t/t6009-rev-list-parent.sh | 3 +++ t/t6012-rev-list-simplify.sh | 3 +++ t/t6013-rev-list-reverse-parents.sh | 3 +++ t/t6016-rev-list-graph-simplify-history.sh | 3 +++ t/t6017-rev-list-stdin.sh | 3 +++ t/t6018-rev-list-glob.sh | 3 +++ t/t6019-rev-list-ancestry-path.sh | 3 +++ t/t6030-bisect-porcelain.sh | 3 +++ t/t6040-tracking-info.sh | 3 +++ t/t6050-replace.sh | 3 +++ t/t6101-rev-parse-parents.sh | 3 +++ t/t6110-rev-list-sparse.sh | 3 +++ t/t6111-rev-list-treesame.sh | 3 +++ t/t6112-rev-list-filters-objects.sh | 3 +++ t/t6120-describe.sh | 3 +++ t/t6200-fmt-merge-msg.sh | 3 +++ t/t6300-for-each-ref.sh | 3 +++ t/t6302-for-each-ref-filter.sh | 3 +++ t/t6400-merge-df.sh | 3 +++ t/t6402-merge-rename.sh | 3 +++ t/t6404-recursive-merge.sh | 3 +++ t/t6405-merge-symlinks.sh | 3 +++ t/t6406-merge-attr.sh | 3 +++ t/t6407-merge-binary.sh | 3 +++ t/t6409-merge-subtree.sh | 3 +++ t/t6411-merge-filemode.sh | 3 +++ t/t6412-merge-large-rename.sh | 3 +++ t/t6413-merge-crlf.sh | 3 +++ t/t6414-merge-rename-nocruft.sh | 3 +++ t/t6415-merge-dir-to-symlink.sh | 3 +++ t/t6416-recursive-corner-cases.sh | 3 +++ t/t6417-merge-ours-theirs.sh | 3 +++ t/t6418-merge-text-auto.sh | 3 +++ t/t6419-merge-ignorecase.sh | 3 +++ t/t6422-merge-rename-corner-cases.sh | 3 +++ t/t6425-merge-rename-delete.sh | 3 +++ t/t6427-diff3-conflict-markers.sh | 3 +++ t/t6430-merge-recursive.sh | 3 +++ t/t6432-merge-recursive-space-options.sh | 3 +++ t/t6433-merge-toplevel.sh | 3 +++ t/t6434-merge-recursive-rename-options.sh | 3 +++ t/t6436-merge-overwrite.sh | 3 +++ t/t6437-submodule-merge.sh | 3 +++ t/t6439-merge-co-error-msgs.sh | 3 +++ t/t6501-freshen-objects.sh | 3 +++ t/t7003-filter-branch.sh | 3 +++ t/t7004-tag.sh | 3 +++ t/t7030-verify-tag.sh | 3 +++ t/t7060-wtstatus.sh | 3 +++ t/t7063-status-untracked-cache.sh | 3 +++ t/t7064-wtstatus-pv2.sh | 3 +++ t/t7102-reset.sh | 3 +++ t/t7113-post-index-change-hook.sh | 3 +++ t/t7201-co.sh | 3 +++ t/t7400-submodule-basic.sh | 3 +++ t/t7403-submodule-sync.sh | 3 +++ t/t7406-submodule-update.sh | 3 +++ t/t7407-submodule-foreach.sh | 3 +++ t/t7409-submodule-detached-work-tree.sh | 3 +++ t/t7417-submodule-path-url.sh | 3 +++ t/t7501-commit-basic-functionality.sh | 3 +++ t/t7502-commit-porcelain.sh | 3 +++ t/t7503-pre-commit-and-pre-merge-commit-hooks.sh | 3 +++ t/t7504-commit-msg-hook.sh | 3 +++ t/t7505-prepare-commit-msg-hook.sh | 3 +++ t/t7510-signed-commit.sh | 3 +++ t/t7512-status-help.sh | 3 +++ t/t7517-per-repo-email.sh | 3 +++ t/t7600-merge.sh | 3 +++ t/t7608-merge-messages.sh | 3 +++ t/t7610-mergetool.sh | 3 +++ t/t7611-merge-abort.sh | 3 +++ t/t7612-merge-verify-signatures.sh | 3 +++ t/t7614-merge-signoff.sh | 3 +++ t/t7701-repack-unpack-unreachable.sh | 3 +++ t/t7800-difftool.sh | 3 +++ t/t7810-grep.sh | 3 +++ t/t8001-annotate.sh | 3 +++ t/t8002-blame.sh | 3 +++ t/t8003-blame-corner-cases.sh | 3 +++ t/t8004-blame-with-conflicts.sh | 3 +++ t/t8012-blame-colors.sh | 3 +++ t/t9001-send-email.sh | 3 +++ t/t9100-git-svn-basic.sh | 3 +++ t/t9145-git-svn-master-branch.sh | 3 +++ t/t9151-svn-mergeinfo.sh | 3 +++ t/t9155-git-svn-fetch-deleted-tag.sh | 3 +++ t/t9156-git-svn-fetch-deleted-tag-2.sh | 3 +++ t/t9163-git-svn-reset-clears-caches.sh | 3 +++ t/t9169-git-svn-dcommit-crlf.sh | 3 +++ t/t9300-fast-import.sh | 3 +++ t/t9301-fast-import-notes.sh | 3 +++ t/t9350-fast-export.sh | 3 +++ t/t9351-fast-export-anonymize.sh | 3 +++ t/t9400-git-cvsserver-server.sh | 3 +++ t/t9401-git-cvsserver-crlf.sh | 3 +++ t/t9402-git-cvsserver-refs.sh | 3 +++ t/t9500-gitweb-standalone-no-errors.sh | 3 +++ t/t9501-gitweb-standalone-http-status.sh | 3 +++ t/t9502-gitweb-standalone-parse-output.sh | 3 +++ t/t9600-cvsimport.sh | 3 +++ t/t9601-cvsimport-vendor-branch.sh | 3 +++ t/t9602-cvsimport-branches-tags.sh | 3 +++ t/t9603-cvsimport-patchsets.sh | 3 +++ t/t9800-git-p4-basic.sh | 3 +++ t/t9801-git-p4-branch.sh | 3 +++ t/t9806-git-p4-options.sh | 3 +++ t/t9807-git-p4-submit.sh | 3 +++ t/t9811-git-p4-label-import.sh | 3 +++ t/t9902-completion.sh | 3 +++ t/t9903-bash-prompt.sh | 3 +++ 325 files changed, 974 insertions(+) diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index 6c27b886b8..50e0b90073 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -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) diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh index 960ed150cb..0a396c95e5 100755 --- a/t/t0002-gitfile.sh +++ b/t/t0002-gitfile.sh @@ -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() { diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index b63ba62e5d..0d43189048 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -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() { diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index f6deaf498b..adf862aef1 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -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" diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh index bfc4fb9af5..ccdc91c41c 100755 --- a/t/t0028-working-tree-encoding.sh +++ b/t/t0028-working-tree-encoding.sh @@ -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 diff --git a/t/t0041-usage.sh b/t/t0041-usage.sh index 5b927b76fe..068b784e72 100755 --- a/t/t0041-usage.sh +++ b/t/t0041-usage.sh @@ -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 ' ' diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index 608673fb77..368f7d515b 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -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') diff --git a/t/t0100-previous.sh b/t/t0100-previous.sh index 58c0b7e9b6..c3c2770ab3 100755 --- a/t/t0100-previous.sh +++ b/t/t0100-previous.sh @@ -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}' ' diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh index 181956b241..57caa3a73f 100755 --- a/t/t1004-read-tree-m-u-wf.sh +++ b/t/t1004-read-tree-m-u-wf.sh @@ -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 diff --git a/t/t1008-read-tree-overlay.sh b/t/t1008-read-tree-overlay.sh index cf96016844..edb89447c7 100755 --- a/t/t1008-read-tree-overlay.sh +++ b/t/t1008-read-tree-overlay.sh @@ -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 diff --git a/t/t1009-read-tree-new-index.sh b/t/t1009-read-tree-new-index.sh index 59b3aa4bc4..b9bab37ac0 100755 --- a/t/t1009-read-tree-new-index.sh +++ b/t/t1009-read-tree-new-index.sh @@ -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 ' diff --git a/t/t1021-rerere-in-workdir.sh b/t/t1021-rerere-in-workdir.sh index 301e071ff7..9177871c99 100755 --- a/t/t1021-rerere-in-workdir.sh +++ b/t/t1021-rerere-in-workdir.sh @@ -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 ' diff --git a/t/t1090-sparse-checkout-scope.sh b/t/t1090-sparse-checkout-scope.sh index f35a73dd20..d731322633 100755 --- a/t/t1090-sparse-checkout-scope.sh +++ b/t/t1090-sparse-checkout-scope.sh @@ -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' ' diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index 84acfc48b6..25e68ca036 100755 --- a/t/t1091-sparse-checkout-builtin.sh +++ b/t/t1091-sparse-checkout-builtin.sh @@ -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() { diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 825d9a184f..67e201b5c1 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -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' ' diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index 2dc853d1be..c573438f98 100755 --- a/t/t1301-shared-repo.sh +++ b/t/t1301-shared-repo.sh @@ -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. diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 4c01e08551..4ae6f50c02 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -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 diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh index 5d955c3bff..aaf32f3b07 100755 --- a/t/t1403-show-ref.sh +++ b/t/t1403-show-ref.sh @@ -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 ' diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh index 74af927fba..531059b871 100755 --- a/t/t1405-main-ref-store.sh +++ b/t/t1405-main-ref-store.sh @@ -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" diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodule-ref-store.sh index 36b7ef5046..126518c155 100755 --- a/t/t1406-submodule-ref-store.sh +++ b/t/t1406-submodule-ref-store.sh @@ -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" diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-ref-store.sh index 9a84858118..aede1c20d7 100755 --- a/t/t1407-worktree-ref-store.sh +++ b/t/t1407-worktree-ref-store.sh @@ -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" diff --git a/t/t1408-packed-refs.sh b/t/t1408-packed-refs.sh index 1e44a17eea..fd58388232 100755 --- a/t/t1408-packed-refs.sh +++ b/t/t1408-packed-refs.sh @@ -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 ' diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index 730a43d9dd..aa02ca488d 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -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 () { diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh index 985daf1def..f6fecff671 100755 --- a/t/t1411-reflog-show.sh +++ b/t/t1411-reflog-show.sh @@ -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' ' diff --git a/t/t1413-reflog-detach.sh b/t/t1413-reflog-detach.sh index c730600d8a..140914aa29 100755 --- a/t/t1413-reflog-detach.sh +++ b/t/t1413-reflog-detach.sh @@ -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 () { diff --git a/t/t1414-reflog-walk.sh b/t/t1414-reflog-walk.sh index 1181a9fb28..c463b5fc29 100755 --- a/t/t1414-reflog-walk.sh +++ b/t/t1414-reflog-walk.sh @@ -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' ' diff --git a/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh index f6e741c6c0..a26a6b782d 100755 --- a/t/t1416-ref-transaction-hooks.sh +++ b/t/t1416-ref-transaction-hooks.sh @@ -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 ' diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh index c7878a60ed..8c4353746b 100755 --- a/t/t1430-bad-ref-name.sh +++ b/t/t1430-bad-ref-name.sh @@ -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 ' diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh index 408b97d5af..d23da4e8de 100755 --- a/t/t1500-rev-parse.sh +++ b/t/t1500-rev-parse.sh @@ -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 diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh index dc9fe3cbf1..e4343c49b2 100755 --- a/t/t1503-rev-parse-verify.sh +++ b/t/t1503-rev-parse-verify.sh @@ -6,6 +6,9 @@ test_description='test git rev-parse --verify' exec /dev/null 2>&1 || [ $? -eq 128 ] diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh index 187454f5dd..2836b87239 100755 --- a/t/t5541-http-push-smart.sh +++ b/t/t5541-http-push-smart.sh @@ -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" diff --git a/t/t5542-push-http-shallow.sh b/t/t5542-push-http-shallow.sh index ddc1db722d..0feec9c449 100755 --- a/t/t5542-push-http-shallow.sh +++ b/t/t5542-push-http-shallow.sh @@ -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 diff --git a/t/t5543-atomic-push.sh b/t/t5543-atomic-push.sh index 620c30d58f..16a8fc7535 100755 --- a/t/t5543-atomic-push.sh +++ b/t/t5543-atomic-push.sh @@ -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 () { diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh index 38e6f7340e..202d75aebe 100755 --- a/t/t5545-push-options.sh +++ b/t/t5545-push-options.sh @@ -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 () { diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh index 483578b2d7..9ec91792c3 100755 --- a/t/t5550-http-fetch-dumb.sh +++ b/t/t5550-http-fetch-dumb.sh @@ -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 diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh index e40e9ed52f..310b89dbab 100755 --- a/t/t5551-http-fetch-smart.sh +++ b/t/t5551-http-fetch-smart.sh @@ -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 diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh index 7622981cbf..e78a21881f 100755 --- a/t/t5553-set-upstream.sh +++ b/t/t5553-set-upstream.sh @@ -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 () { diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh index 9fafcf1945..5561b7d012 100755 --- a/t/t5560-http-backend-noserver.sh +++ b/t/t5560-http-backend-noserver.sh @@ -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" diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh index 6eb0294978..cba2dffdb0 100755 --- a/t/t5561-http-backend.sh +++ b/t/t5561-http-backend.sh @@ -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 diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index 8f69a7854f..2e99a331c5 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -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 diff --git a/t/t5571-pre-push-hook.sh b/t/t5571-pre-push-hook.sh index ac53d63869..971ed3da4b 100755 --- a/t/t5571-pre-push-hook.sh +++ b/t/t5571-pre-push-hook.sh @@ -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 diff --git a/t/t5580-unc-paths.sh b/t/t5580-unc-paths.sh index cf768b3a27..da4c94cce1 100755 --- a/t/t5580-unc-paths.sh +++ b/t/t5580-unc-paths.sh @@ -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 diff --git a/t/t5581-http-curl-verbose.sh b/t/t5581-http-curl-verbose.sh index 927aad0820..907bb062d6 100755 --- a/t/t5581-http-curl-verbose.sh +++ b/t/t5581-http-curl-verbose.sh @@ -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 diff --git a/t/t5582-fetch-negative-refspec.sh b/t/t5582-fetch-negative-refspec.sh index 8c61e28fec..608e9aa189 100755 --- a/t/t5582-fetch-negative-refspec.sh +++ b/t/t5582-fetch-negative-refspec.sh @@ -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 ' diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 7df3c5373a..e01c5fe02d 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -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= diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh index 2f7be23044..20fbb1e9a3 100755 --- a/t/t5604-clone-reference.sh +++ b/t/t5604-clone-reference.sh @@ -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) diff --git a/t/t5605-clone-local.sh b/t/t5605-clone-local.sh index af23419ebf..94028044b0 100755 --- a/t/t5605-clone-local.sh +++ b/t/t5605-clone-local.sh @@ -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() { diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh index 7f082fb23b..3893a49e6d 100755 --- a/t/t5606-clone-options.sh +++ b/t/t5606-clone-options.sh @@ -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' ' diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh index 26985f4b44..6e2e4adbb4 100755 --- a/t/t5607-clone-bundle.sh +++ b/t/t5607-clone-bundle.sh @@ -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' ' diff --git a/t/t5609-clone-branch.sh b/t/t5609-clone-branch.sh index 6e7a7be052..e4d5124f89 100755 --- a/t/t5609-clone-branch.sh +++ b/t/t5609-clone-branch.sh @@ -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() { diff --git a/t/t5610-clone-detached.sh b/t/t5610-clone-detached.sh index 8b0d607df1..ba63ba8f42 100755 --- a/t/t5610-clone-detached.sh +++ b/t/t5610-clone-detached.sh @@ -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() { diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh index 8e0fd39823..be4ae10c82 100755 --- a/t/t5611-clone-config.sh +++ b/t/t5611-clone-config.sh @@ -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' ' diff --git a/t/t5612-clone-refspec.sh b/t/t5612-clone-refspec.sh index e3b436d8ae..9e37f7fef7 100755 --- a/t/t5612-clone-refspec.sh +++ b/t/t5612-clone-refspec.sh @@ -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' ' diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh index f4d49d8335..b2c3ed4088 100755 --- a/t/t5616-partial-clone.sh +++ b/t/t5616-partial-clone.sh @@ -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. diff --git a/t/t5617-clone-submodules-remote.sh b/t/t5617-clone-submodules-remote.sh index 1a041df10b..cba468fc53 100755 --- a/t/t5617-clone-submodules-remote.sh +++ b/t/t5617-clone-submodules-remote.sh @@ -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) diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh index 022901b9eb..7f0056c1ed 100755 --- a/t/t5700-protocol-v1.sh +++ b/t/t5700-protocol-v1.sh @@ -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 diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh index a1f5fdc9fd..66c47e61d8 100755 --- a/t/t5701-git-serve.sh +++ b/t/t5701-git-serve.sh @@ -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' ' diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh index 7d5b17909b..f1f77fe089 100755 --- a/t/t5702-protocol-v2.sh +++ b/t/t5702-protocol-v2.sh @@ -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 diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh index b46940b725..c3a52d478f 100755 --- a/t/t5703-upload-pack-ref-in-want.sh +++ b/t/t5703-upload-pack-ref-in-want.sh @@ -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 () { diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 0f04b6cddb..1ecefb57fe 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -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 diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index fc4d55dcb2..664000adf0 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -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 ' diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh index 7504ba4751..67c384f1e8 100755 --- a/t/t6001-rev-list-graft.sh +++ b/t/t6001-rev-list-graft.sh @@ -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 ' diff --git a/t/t6004-rev-list-path-optim.sh b/t/t6004-rev-list-path-optim.sh index 3e8c42ee0b..ff788199e3 100755 --- a/t/t6004-rev-list-path-optim.sh +++ b/t/t6004-rev-list-path-optim.sh @@ -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 ' diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index 99a1eaf332..bbbd577f10 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -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 diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh index f0268372d2..51547ac3a5 100755 --- a/t/t6007-rev-list-cherry-pick-file.sh +++ b/t/t6007-rev-list-cherry-pick-file.sh @@ -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 diff --git a/t/t6008-rev-list-submodule.sh b/t/t6008-rev-list-submodule.sh index c4af9ca0a7..871ace31e2 100755 --- a/t/t6008-rev-list-submodule.sh +++ b/t/t6008-rev-list-submodule.sh @@ -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' ' diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh index 916d9692bc..114f755d52 100755 --- a/t/t6009-rev-list-parent.sh +++ b/t/t6009-rev-list-parent.sh @@ -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 () { diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh index fd202fcb94..d163c24859 100755 --- a/t/t6012-rev-list-simplify.sh +++ b/t/t6012-rev-list-simplify.sh @@ -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 () { diff --git a/t/t6013-rev-list-reverse-parents.sh b/t/t6013-rev-list-reverse-parents.sh index 89458d370f..0298174956 100755 --- a/t/t6013-rev-list-reverse-parents.sh +++ b/t/t6013-rev-list-reverse-parents.sh @@ -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 diff --git a/t/t6016-rev-list-graph-simplify-history.sh b/t/t6016-rev-list-graph-simplify-history.sh index f5e6e92f5b..3fb7ee0be4 100755 --- a/t/t6016-rev-list-graph-simplify-history.sh +++ b/t/t6016-rev-list-graph-simplify-history.sh @@ -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' ' diff --git a/t/t6017-rev-list-stdin.sh b/t/t6017-rev-list-stdin.sh index 667b37564e..e51fe7b9bc 100755 --- a/t/t6017-rev-list-stdin.sh +++ b/t/t6017-rev-list-stdin.sh @@ -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 () { diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh index fe2f3cec3d..60a351c26a 100755 --- a/t/t6018-rev-list-glob.sh +++ b/t/t6018-rev-list-glob.sh @@ -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 () { diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh index 353f84313f..aeb7defaa3 100755 --- a/t/t6019-rev-list-ancestry-path.sh +++ b/t/t6019-rev-list-ancestry-path.sh @@ -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 () { diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index aa226381be..7dc65c73cd 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -6,6 +6,9 @@ test_description='Tests git bisect functionality' exec hello.c <