Use main as default branch name
v3 cover tests: use main as default branch name
In reply to Johannes Schindelin via GitGitGadgetThis (big) patch series (almost) concludes the transition of Git's test suite to use init.defaultBranch=main that was started in js/default-branch-name-part-4-minus-1, continued in js/default-branch-name-adjust-t5411 and in js/default-branch-name-adjust-t5515. This transition prepares for changing the fall-back value of init.defaultBranch accordingly (which will be done in a different set of patch series, with an appropriate deprecation period), reflecting what many open source projects already did followed by GitHub, Azure Repos and others.
Before doing anything else, the series starts out with a patch that marks all the test scripts that expect a specific default branch name and won't pass with any other name.
Instead of one huge patch that reflects essentially a search-and-replace in the test suite, this patch series then splits the changes up into chunks that are intended to be smaller than 100kB so that they are not rejected by the Git mailing list. Interspersed between those changes are adjustments e.g. in alignment, to make it easier to review (or recreate) the search-and-replace patches.
Note that this branch is based on next, mostly because it would otherwise conflict with en/merge-tests, jk/diff-release-filespec-fix and ds/maintenance-part-3.
To avoid even more conflicts with topics that did not even make it to seen yet, this patch series specifically excludes t1309, t2106, t3040, t3404, t4013, t4015, t5310, t5526, t6300, t7064, t7817, t9902: in those test scripts, we will still use master for the time being. Once the topics in question have settled, I will send the appropriate follow-up patches to adjust them to use main instead.
Note that even after this patch series, master is still found in t/, even outside of the tests we excluded specifically to avoid conflicts with other patch series that are currently in flight: t/perf/, the git p4 tests (because git p4 still uses p4/master to refer to the remote main branch), and some comments still refer to this name. I intend to address at least some of those, in patch series separate from the current one.
Changes since v2:
* The case statement setting the default branch name for each test script was replaced by an initial patch that sets the default branch name in those test scripts that need it (and only in those). This patch also modifies the linux-gcc job to verify that the test suite runs with overridden default branch name (which the now-marked test scripts over-override).
* Four more test scripts were excluded from this patch series: t1309, t2106, t3040 and t4015. These are handled in four separate patch series, where I try to remove the requirement to hard-code the default branch name in the first place.
Changes since v1:
* Dropped the commit changing the default initial branch name for git init.
* Adjusted the patch for t1402 to also replace naster by nain.
* Excluded t5526 from the patches for now, to avoid clashing with pk/subsub-fetch-fix.
Johannes Schindelin (28):
tests: mark tests relying on the current default for
init.defaultBranch
t0060: preemptively adjust alignment
t[01]*: adjust the references to the default branch name "main" t2*: adjust the references to the default branch name "main" t3[0-3]*: adjust the references to the default branch name "main"
t3416: preemptively adjust alignment in a comment
t34*: adjust the references to the default branch name "main" t3[5-9]*: adjust the references to the default branch name "main" t4*: adjust the references to the default branch name "main"
t5323: prepare centered comment for master -> main t5[0-4]*: adjust the references to the default branch name "main"
t5503: prepare aligned comment for replacing master with main t550*: adjust the references to the default branch name "main" t551*: adjust the references to the default branch name "main" t55[23]*: adjust the references to the default branch name "main" t55[4-9]*: adjust the references to the default branch name "main" t5[6-9]*: adjust the references to the default branch name "main" t6[0-3]*: adjust the references to the default branch name "main" t64*: preemptively adjust alignment to prepare for master -> main t6[4-9]*: adjust the references to the default branch name "main" t7[0-4]*: adjust the references to the default branch name "main" t7[5-9]*: adjust the references to the default branch name "main" t8*: adjust the references to the default branch name "main" t9[0-4]*: adjust the references to the default branch name "main" t9[5-7]*: adjust the references to the default branch name "main" tests(git-p4): transition to the default branch name main t99*: adjust the references to the default branch name "main"
tests: drop prereq PREPARE_FOR_MAIN_BRANCH where no longer needed
ci/run-build-and-tests.sh | 2 + t/annotate-tests.sh | 8 +- t/lib-cvs.sh | 2 +- t/t0002-gitfile.sh | 9 +- t/t0020-crlf.sh | 11 +- t/t0021-conversion.sh | 43 +- t/t0027-auto-crlf.sh | 4 +- t/t0028-working-tree-encoding.sh | 7 +- t/t0041-usage.sh | 13 +- t/t0050-filesystem.sh | 9 +- t/t0060-path-utils.sh | 4 +- t/t0100-previous.sh | 21 +- t/t1004-read-tree-m-u-wf.sh | 43 +- t/t1008-read-tree-overlay.sh | 5 +- t/t1009-read-tree-new-index.sh | 7 +- t/t1011-read-tree-sparse-checkout.sh | 2 +- t/t1021-rerere-in-workdir.sh | 5 +- t/t1090-sparse-checkout-scope.sh | 13 +- t/t1091-sparse-checkout-builtin.sh | 5 +- t/t1300-config.sh | 11 +- t/t1301-shared-repo.sh | 7 +- t/t1305-config-include.sh | 2 +- t/t1400-update-ref.sh | 75 +-- t/t1402-check-ref-format.sh | 32 +- t/t1403-show-ref.sh | 21 +- t/t1405-main-ref-store.sh | 45 +- t/t1406-submodule-ref-store.sh | 33 +- t/t1407-worktree-ref-store.sh | 35 +- t/t1408-packed-refs.sh | 15 +- t/t1410-reflog.sh | 59 +- t/t1411-reflog-show.sh | 5 +- t/t1413-reflog-detach.sh | 27 +- t/t1414-reflog-walk.sh | 15 +- t/t1416-ref-transaction-hooks.sh | 13 +- t/t1430-bad-ref-name.sh | 55 +- t/t1450-fsck.sh | 2 +- t/t1500-rev-parse.sh | 7 +- t/t1503-rev-parse-verify.sh | 31 +- t/t1505-rev-parse-last.sh | 11 +- t/t1506-rev-parse-diagnosis.sh | 7 +- t/t1507-rev-parse-upstream.sh | 43 +- t/t1508-at-combinations.sh | 13 +- t/t1511-rev-parse-caret.sh | 29 +- t/t1512-rev-parse-disambiguation.sh | 5 +- t/t1513-rev-parse-prefix.sh | 7 +- t/t1514-rev-parse-push.sh | 19 +- t/t1700-split-index.sh | 5 +- t/t2007-checkout-symlink.sh | 13 +- t/t2009-checkout-statinfo.sh | 11 +- t/t2010-checkout-ambiguous.sh | 7 +- t/t2011-checkout-invalid-head.sh | 19 +- t/t2012-checkout-last.sh | 51 +- t/t2015-checkout-unborn.sh | 5 +- t/t2017-checkout-orphan.sh | 47 +- t/t2020-checkout-detach.sh | 31 +- t/t2022-checkout-paths.sh | 25 +- t/t2023-checkout-m.sh | 13 +- t/t2024-checkout-dwim.sh | 70 +-- t/t2027-checkout-track.sh | 9 +- t/t2030-unresolve-info.sh | 9 +- t/t2060-switch.sh | 33 +- t/t2070-restore.sh | 7 +- t/t2400-worktree-add.sh | 69 +-- t/t2401-worktree-prune.sh | 5 +- t/t2402-worktree-list.sh | 23 +- t/t2405-worktree-submodule.sh | 9 +- t/t3200-branch.sh | 251 ++++----- t/t3201-branch-contains.sh | 85 +-- t/t3202-show-branch-octopus.sh | 5 +- t/t3203-branch-output.sh | 43 +- t/t3204-branch-name-interpretation.sh | 9 +- t/t3205-branch-color.sh | 11 +- t/t3206-range-diff.sh | 43 +- t/t3206/history.export | 2 +- t/t3210-pack-refs.sh | 7 +- t/t3211-peel-ref.sh | 7 +- t/t3301-notes.sh | 6 +- t/t3302-notes-index-expensive.sh | 5 +- t/t3303-notes-subtrees.sh | 11 +- t/t3304-notes-mixed.sh | 11 +- t/t3308-notes-merge.sh | 2 +- t/t3320-notes-merge-worktrees.sh | 7 +- t/t3400-rebase.sh | 63 +-- t/t3402-rebase-merge.sh | 47 +- t/t3403-rebase-skip.sh | 9 +- t/t3404-rebase-interactive.sh | 3 + t/t3405-rebase-malformed.sh | 11 +- t/t3406-rebase-message.sh | 27 +- t/t3407-rebase-abort.sh | 21 +- t/t3408-rebase-multi-line.sh | 5 +- t/t3409-rebase-preserve-merges.sh | 13 +- t/t3412-rebase-root.sh | 31 +- t/t3413-rebase-hook.sh | 45 +- t/t3415-rebase-autosquash.sh | 5 +- t/t3416-rebase-onto-threedots.sh | 57 +- t/t3418-rebase-continue.sh | 27 +- t/t3419-rebase-patch-id.sh | 15 +- t/t3420-rebase-autostash.sh | 11 +- t/t3423-rebase-reword.sh | 6 +- t/t3427-rebase-subtree.sh | 23 +- t/t3430-rebase-merges.sh | 19 +- t/t3431-rebase-fork-point.sh | 35 +- t/t3432-rebase-fast-forward.sh | 37 +- t/t3434-rebase-i18n.sh | 11 +- t/t3435-rebase-gpg-sign.sh | 7 +- t/t3436-rebase-more-options.sh | 2 +- t/t3500-cherry.sh | 15 +- t/t3501-revert-cherry-pick.sh | 7 +- t/t3502-cherry-pick-merge.sh | 5 +- t/t3503-cherry-pick-root.sh | 13 +- t/t3504-cherry-pick-rerere.sh | 27 +- t/t3505-cherry-pick-empty.sh | 27 +- t/t3506-cherry-pick-ff.sh | 11 +- t/t3507-cherry-pick-conflict.sh | 5 +- t/t3508-cherry-pick-many-commits.sh | 41 +- t/t3509-cherry-pick-merge-df.sh | 5 +- t/t3512-cherry-pick-submodule.sh | 5 +- t/t3600-rm.sh | 13 +- t/t3701-add-interactive.sh | 7 +- t/t3901-i18n-patch.sh | 43 +- t/t3903-stash.sh | 35 +- t/t3910-mac-os-precompose.sh | 9 +- t/t4013-diff-various.sh | 3 + t/t4014-format-patch.sh | 179 ++++--- t/t4017-diff-retval.sh | 5 +- t/t4038-diff-combined.sh | 17 +- t/t4041-diff-submodule-option.sh | 5 +- t/t4048-diff-combined-binary.sh | 13 +- t/t4052-stat-output.sh | 7 +- t/t4056-diff-order.sh | 5 +- t/t4057-diff-combined-paths.sh | 23 +- t/t4061-diff-indent.sh | 27 +- t/t4066-diff-emit-delay.sh | 5 +- t/t4068-diff-symmetric-merge-base.sh | 51 +- t/t4103-apply-binary.sh | 39 +- t/t4108-apply-threeway.sh | 17 +- t/t4121-apply-diffs.sh | 5 +- t/t4122-apply-symlink-inside.sh | 9 +- t/t4150-am.sh | 29 +- t/t4200-rerere.sh | 23 +- t/t4201-shortlog.sh | 5 +- t/t4202-log.sh | 109 ++-- t/t4203-mailmap.sh | 5 +- t/t4204-patch-id.sh | 29 +- t/t4207-log-decoration-colors.sh | 9 +- t/t4208-log-magic-pathspec.sh | 7 +- t/t4211-line-log.sh | 3 + t/t4211/history.export | 2 +- t/t4214-log-graph-octopus.sh | 5 +- t/t4216-log-bloom.sh | 7 +- t/t4253-am-keep-cr-dos.sh | 23 +- t/t4257-am-interactive.sh | 2 +- t/t5150-request-pull.sh | 37 +- t/t5304-prune.sh | 5 +- t/t5305-include-tag.sh | 5 +- t/t5310-pack-bitmaps.sh | 3 + t/t5312-prune-corruption.sh | 19 +- t/t5317-pack-objects-filter-objects.sh | 5 +- t/t5322-pack-objects-sparse.sh | 5 +- t/t5323-pack-redundant.sh | 66 +-- t/t5400-send-pack.sh | 63 +-- t/t5401-update-hooks.sh | 24 +- t/t5402-post-merge-hook.sh | 5 +- t/t5403-post-checkout-hook.sh | 9 +- t/t5404-tracking-branches.sh | 11 +- t/t5405-send-pack-rewind.sh | 9 +- t/t5407-post-rewrite-hook.sh | 5 +- t/t5410-receive-pack-alternates.sh | 7 +- t/t5500-fetch-pack.sh | 31 +- t/t5501-fetch-push-alternates.sh | 7 +- t/t5502-quickfetch.sh | 9 +- t/t5503-tagfollow.sh | 15 +- t/t5504-fetch-receive-strict.sh | 23 +- t/t5505-remote.sh | 151 +++--- t/t5506-remote-groups.sh | 7 +- t/t5509-fetch-push-namespaces.sh | 33 +- t/t5510-fetch.sh | 165 +++--- t/t5511-refspec.sh | 12 +- t/t5512-ls-remote.sh | 29 +- t/t5514-fetch-multiple.sh | 33 +- t/t5516-fetch-push.sh | 503 +++++++++--------- t/t5517-push-mirror.sh | 127 ++--- t/t5518-fetch-exit-status.sh | 9 +- t/t5519-push-alternates.sh | 15 +- t/t5520-pull.sh | 33 +- t/t5521-pull-options.sh | 19 +- t/t5523-push-upstream.sh | 33 +- t/t5526-fetch-submodules.sh | 3 + t/t5527-fetch-odd-refs.sh | 17 +- t/t5528-push-default.sh | 101 ++-- t/t5529-push-errors.sh | 2 +- t/t5530-upload-pack-error.sh | 2 +- t/t5531-deep-submodule-push.sh | 191 +++---- t/t5533-push-cas.sh | 145 ++--- t/t5534-push-signed.sh | 7 +- t/t5537-fetch-shallow.sh | 33 +- t/t5538-push-shallow.sh | 25 +- t/t5539-fetch-http-shallow.sh | 17 +- t/t5540-http-push-webdav.sh | 11 +- t/t5541-http-push-smart.sh | 43 +- t/t5542-push-http-shallow.sh | 11 +- t/t5543-atomic-push.sh | 83 +-- t/t5545-push-options.sh | 65 +-- t/t5548-push-porcelain.sh | 64 +-- t/t5550-http-fetch-dumb.sh | 23 +- t/t5551-http-fetch-smart.sh | 23 +- t/t5552-skipping-fetch-negotiator.sh | 2 +- t/t5553-set-upstream.sh | 85 +-- t/t5560-http-backend-noserver.sh | 3 + t/t5561-http-backend.sh | 7 +- t/t556x_common | 8 +- t/t5570-git-daemon.sh | 19 +- t/t5571-pre-push-hook.sh | 7 +- t/t5572-pull-submodule.sh | 4 +- t/t5580-unc-paths.sh | 5 +- t/t5581-http-curl-verbose.sh | 5 +- t/t5582-fetch-negative-refspec.sh | 25 +- t/t5601-clone.sh | 7 +- t/t5604-clone-reference.sh | 15 +- t/t5605-clone-local.sh | 13 +- t/t5606-clone-options.sh | 11 +- t/t5607-clone-bundle.sh | 17 +- t/t5608-clone-2gb.sh | 2 +- t/t5609-clone-branch.sh | 9 +- t/t5610-clone-detached.sh | 7 +- t/t5611-clone-config.sh | 19 +- t/t5612-clone-refspec.sh | 45 +- t/t5614-clone-submodules-shallow.sh | 2 +- t/t5616-partial-clone.sh | 53 +- t/t5617-clone-submodules-remote.sh | 9 +- t/t5700-protocol-v1.sh | 19 +- t/t5701-git-serve.sh | 19 +- t/t5702-protocol-v2.sh | 53 +- t/t5703-upload-pack-ref-in-want.sh | 63 +-- t/t5801-remote-helpers.sh | 27 +- t/t6000-rev-list-misc.sh | 5 +- t/t6001-rev-list-graft.sh | 5 +- t/t6004-rev-list-path-optim.sh | 17 +- t/t6006-rev-list-format.sh | 17 +- t/t6007-rev-list-cherry-pick-file.sh | 7 +- t/t6008-rev-list-submodule.sh | 5 +- t/t6009-rev-list-parent.sh | 9 +- t/t6012-rev-list-simplify.sh | 11 +- t/t6013-rev-list-reverse-parents.sh | 13 +- t/t6016-rev-list-graph-simplify-history.sh | 5 +- t/t6017-rev-list-stdin.sh | 11 +- t/t6018-rev-list-glob.sh | 53 +- t/t6019-rev-list-ancestry-path.sh | 9 +- t/t6030-bisect-porcelain.sh | 13 +- t/t6040-tracking-info.sh | 57 +- t/t6050-replace.sh | 13 +- t/t6101-rev-parse-parents.sh | 5 +- t/t6110-rev-list-sparse.sh | 5 +- t/t6111-rev-list-treesame.sh | 9 +- t/t6112-rev-list-filters-objects.sh | 17 +- t/t6120-describe.sh | 23 +- t/t6200-fmt-merge-msg.sh | 53 +- t/t6300-for-each-ref.sh | 3 + t/t6302-for-each-ref-filter.sh | 61 ++- t/t6400-merge-df.sh | 9 +- t/t6402-merge-rename.sh | 49 +- t/t6404-recursive-merge.sh | 7 +- t/t6405-merge-symlinks.sh | 17 +- t/t6406-merge-attr.sh | 27 +- t/t6407-merge-binary.sh | 9 +- t/t6409-merge-subtree.sh | 19 +- t/t6411-merge-filemode.sh | 13 +- t/t6412-merge-large-rename.sh | 9 +- t/t6413-merge-crlf.sh | 5 +- t/t6414-merge-rename-nocruft.sh | 5 +- t/t6415-merge-dir-to-symlink.sh | 25 +- t/t6416-recursive-corner-cases.sh | 31 +- t/t6417-merge-ours-theirs.sh | 31 +- t/t6418-merge-text-auto.sh | 15 +- t/t6419-merge-ignorecase.sh | 13 +- t/t6422-merge-rename-corner-cases.sh | 15 +- t/t6425-merge-rename-delete.sh | 5 +- t/t6427-diff3-conflict-markers.sh | 17 +- t/t6430-merge-recursive.sh | 21 +- t/t6432-merge-recursive-space-options.sh | 9 +- t/t6433-merge-toplevel.sh | 11 +- t/t6434-merge-recursive-rename-options.sh | 9 +- t/t6436-merge-overwrite.sh | 5 +- t/t6437-submodule-merge.sh | 17 +- t/t6439-merge-co-error-msgs.sh | 9 +- t/t6501-freshen-objects.sh | 5 +- t/t7003-filter-branch.sh | 43 +- t/t7004-tag.sh | 11 +- t/t7030-verify-tag.sh | 5 +- t/t7060-wtstatus.sh | 29 +- t/t7063-status-untracked-cache.sh | 17 +- t/t7064-wtstatus-pv2.sh | 3 + t/t7102-reset.sh | 9 +- t/t7113-post-index-change-hook.sh | 5 +- t/t7201-co.sh | 113 ++-- t/t7400-submodule-basic.sh | 23 +- t/t7403-submodule-sync.sh | 13 +- t/t7406-submodule-update.sh | 41 +- t/t7407-submodule-foreach.sh | 27 +- t/t7409-submodule-detached-work-tree.sh | 11 +- t/t7417-submodule-path-url.sh | 5 +- t/t7501-commit-basic-functionality.sh | 5 +- t/t7502-commit-porcelain.sh | 15 +- ...3-pre-commit-and-pre-merge-commit-hooks.sh | 45 +- t/t7504-commit-msg-hook.sh | 27 +- t/t7505-prepare-commit-msg-hook.sh | 23 +- t/t7508-status.sh | 58 +- t/t7510-signed-commit.sh | 5 +- t/t7512-status-help.sh | 43 +- t/t7517-per-repo-email.sh | 15 +- t/t7600-merge.sh | 47 +- t/t7606-merge-custom.sh | 2 +- t/t7608-merge-messages.sh | 39 +- t/t7610-mergetool.sh | 177 +++--- t/t7611-merge-abort.sh | 7 +- t/t7612-merge-verify-signatures.sh | 5 +- t/t7614-merge-signoff.sh | 27 +- t/t7701-repack-unpack-unreachable.sh | 5 +- t/t7800-difftool.sh | 41 +- t/t7810-grep.sh | 31 +- t/t8001-annotate.sh | 5 +- t/t8002-blame.sh | 3 + t/t8003-blame-corner-cases.sh | 7 +- t/t8004-blame-with-conflicts.sh | 17 +- t/t8012-blame-colors.sh | 3 + t/t9001-send-email.sh | 31 +- t/t9100-git-svn-basic.sh | 5 +- t/t9145-git-svn-master-branch.sh | 9 +- t/t9151-svn-mergeinfo.sh | 5 +- t/t9155-git-svn-fetch-deleted-tag.sh | 5 +- t/t9156-git-svn-fetch-deleted-tag-2.sh | 9 +- t/t9163-git-svn-reset-clears-caches.sh | 5 +- t/t9169-git-svn-dcommit-crlf.sh | 5 +- t/t9300-fast-import.sh | 85 +-- t/t9301-fast-import-notes.sh | 17 +- t/t9302-fast-import-unpack-limit.sh | 16 +- t/t9350-fast-export.sh | 89 ++-- t/t9351-fast-export-anonymize.sh | 7 +- t/t9400-git-cvsserver-server.sh | 35 +- t/t9401-git-cvsserver-crlf.sh | 19 +- t/t9402-git-cvsserver-refs.sh | 11 +- t/t9500-gitweb-standalone-no-errors.sh | 23 +- t/t9501-gitweb-standalone-http-status.sh | 17 +- t/t9502-gitweb-standalone-parse-output.sh | 19 +- t/t9600-cvsimport.sh | 5 +- t/t9601-cvsimport-vendor-branch.sh | 19 +- t/t9602-cvsimport-branches-tags.sh | 7 +- t/t9603-cvsimport-patchsets.sh | 11 +- t/t9800-git-p4-basic.sh | 5 +- t/t9801-git-p4-branch.sh | 19 +- t/t9806-git-p4-options.sh | 21 +- t/t9807-git-p4-submit.sh | 5 +- t/t9811-git-p4-label-import.sh | 5 +- t/t9902-completion.sh | 3 + t/t9903-bash-prompt.sh | 117 ++-- 355 files changed, 4835 insertions(+), 3861 deletions(-)
base-commit: aff20da3a209088e7f8f3632077fa11b86453d67
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-762%2Fdscho%2Fuse-main-as-default-branch-name-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-762/dscho/use-main-as-default-branch-name-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/762
Range-diff vs v2:
-: ---------- > 1: e9ee22525a tests: mark tests relying on the current default for `init.defaultBranch`
1: 0a05d319c0 = 2: 8c2e158c8f t0060: preemptively adjust alignment
2: b8fa037791 ! 3: 9b7749dcde t[01]*: adjust the references to the default branch name "main"
@@ Metadata
## Commit message ##
t[01]*: adjust the references to the default branch name "main"
- This trick was performed via
+ Carefully excluding t1309, which sees independent development elsewhere
+ at the time of writing, we transition above-mentioned tests to the
+ default branch name `main`. This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
- -e 's/Master/Main/g' -e 's/naster/nain/g' -- t[01]*.sh)
+ -e 's/Master/Main/g' -e 's/naster/nain/g' -- t[01]*.sh &&
+ git checkout HEAD -- t1309\*)
Note that t5533 contains a variation of the name `master` (`naster`)
that we rename here, too.
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t0002-gitfile.sh ##
+@@ t/t0002-gitfile.sh: test_description='.git file
+
+ Verify that plumbing commands work when .git is a file
+ '
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t0002-gitfile.sh: test_expect_success 'enter_repo non-strict mode' '
git ls-remote enter_repo >actual &&
cat >expected <<-EOF &&
@@ t/t0002-gitfile.sh: test_expect_success 'enter_repo strict mode' '
test_cmp expected actual
## t/t0020-crlf.sh ##
+@@
+
+ test_description='CRLF conversion'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t0020-crlf.sh: test_expect_success 'checkout with existing .gitattributes' '
git add .gitattributes .file &&
git commit -m second &&
@@ t/t0020-crlf.sh: test_expect_success 'checkout when deleting .gitattributes' '
'
## t/t0021-conversion.sh ##
+@@
+
+ test_description='blob conversion via gitattributes'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t0021-conversion.sh: test_expect_success PERL 'required process filter should filter data' '
test_cmp_count expected.log debug.log &&
@@ t/t0027-auto-crlf.sh: test_expect_success 'ls-files --eol -o Text/Binary' '
printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\nLINETWO\nLINETHREE" >LF &&
## t/t0028-working-tree-encoding.sh ##
+@@
+
+ test_description='working-tree-encoding conversion via gitattributes'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t0028-working-tree-encoding.sh: test_expect_success 'error if encoding round trip is not the same during refresh
TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16le) &&
git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16le &&
@@ t/t0028-working-tree-encoding.sh: test_expect_success 'error if encoding garbage
test_i18ngrep "error: BOM is required" err.out
## t/t0041-usage.sh ##
+@@
+
+ test_description='Test commands behavior when given invalid argument value'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t0041-usage.sh: test_expect_success 'tag usage error' '
'
@@ t/t0041-usage.sh: test_expect_success 'for-each-ref --contains <inexistent_objec
'
## t/t0050-filesystem.sh ##
+@@
+
+ test_description='Various filesystem issues'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t0050-filesystem.sh: test_expect_success "setup case tests" '
git mv camelcase tmp &&
git mv tmp CamelCase &&
@@ t/t0060-path-utils.sh: test_git_path GIT_COMMON_DIR=bar info/sparse-checkout
test_git_path GIT_COMMON_DIR=bar config bar/config
## t/t0100-previous.sh ##
+@@
+
+ test_description='previous branch syntax @{-n}'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t0100-previous.sh: test_expect_success 'branch -d @{-1}' '
test_commit A &&
git checkout -b junk &&
@@ t/t0100-previous.sh: test_expect_success 'merge @{-1}~1' '
## t/t1004-read-tree-m-u-wf.sh ##
+@@
+
+ test_description='read-tree -m -u checks working tree files'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1004-read-tree-m-u-wf.sh: test_expect_success 'two-way setup' '
git branch side &&
git tag -f branch-point &&
@@ t/t1004-read-tree-m-u-wf.sh: test_expect_success 'three-way not complaining on a
test_expect_success '3-way not overwriting local changes (setup)' '
## t/t1008-read-tree-overlay.sh ##
+@@
+
+ test_description='test multi-tree read-tree without merging'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1008-read-tree-overlay.sh: test_expect_success setup '
'
@@ t/t1008-read-tree-overlay.sh: test_expect_success setup '
test_cmp expect actual
## t/t1009-read-tree-new-index.sh ##
+@@
+
+ test_description='test read-tree into a fresh index file'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1009-read-tree-new-index.sh: test_expect_success setup '
test_expect_success 'non-existent index file' '
@@ t/t1011-read-tree-sparse-checkout.sh
| M init.t
## t/t1021-rerere-in-workdir.sh ##
+@@
+ #!/bin/sh
+
+ test_description='rerere run in a workdir'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1021-rerere-in-workdir.sh: test_expect_success SYMLINKS setup '
test_tick &&
git commit -a -m goodbye &&
@@ t/t1021-rerere-in-workdir.sh: test_expect_success SYMLINKS setup '
test_expect_success SYMLINKS 'rerere in workdir' '
## t/t1090-sparse-checkout-scope.sh ##
+@@
+
+ test_description='sparse checkout scope tests'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1090-sparse-checkout-scope.sh: test_expect_success 'create feature branch' '
git commit -m "modification"
'
@@ t/t1090-sparse-checkout-scope.sh: test_expect_success 'merge feature branch into
test_path_is_file c &&
## t/t1091-sparse-checkout-builtin.sh ##
+@@
+
+ test_description='sparse checkout builtin tests'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1091-sparse-checkout-builtin.sh: test_expect_success 'interaction with clone --no-checkout (unborn index)' '
test_path_is_missing clone_no_checkout/.git/index &&
@@ t/t1091-sparse-checkout-builtin.sh: test_expect_success 'interaction with clone
'
## t/t1300-config.sh ##
+@@
+
+ test_description='Test git config in different settings'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1300-config.sh: test_expect_success 'check split_cmdline return' "
echo foo > foo &&
git add foo &&
@@ t/t1300-config.sh: test_expect_success '--show-origin blob' '
## t/t1301-shared-repo.sh ##
+@@
+
+ test_description='Test shared repository initialization'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1301-shared-repo.sh: test_expect_success POSIXPERM 'git reflog expire honors core.sharedRepository' '
umask 077 &&
git config core.sharedRepository group &&
@@ t/t1305-config-include.sh: test_expect_success SYMLINKS 'conditional include, gi
git checkout -b foo-branch &&
echo 9 >expect &&
- ## t/t1309-early-config.sh ##
-@@ t/t1309-early-config.sh: test_expect_failure 'ignore .git/ with invalid config' '
-
- test_expect_success 'early config and onbranch' '
- echo "[broken" >broken &&
-- test_with_config "[includeif \"onbranch:master\"]path=../broken"
-+ test_with_config "[includeif \"onbranch:main\"]path=../broken"
- '
+ ## t/t1400-update-ref.sh ##
+@@
+ #
- test_expect_success 'onbranch config outside of git repo' '
-- test_config_global includeIf.onbranch:master.path non-existent &&
-+ test_config_global includeIf.onbranch:main.path non-existent &&
- nongit git help
- '
+ test_description='Test git update-ref and basic ref logging'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
- ## t/t1400-update-ref.sh ##
-@@ t/t1400-update-ref.sh: test_description='Test git update-ref and basic ref logging'
+ . ./test-lib.sh
Z=$ZERO_OID
@@ t/t1402-check-ref-format.sh: test_expect_success 'check-ref-format --branch @{-1
## t/t1403-show-ref.sh ##
+@@
+ #!/bin/sh
+
+ test_description='show-ref'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1403-show-ref.sh: test_expect_success setup '
git checkout -b side &&
test_commit B &&
@@ t/t1403-show-ref.sh: test_expect_success 'show-ref -d' '
done >expect.heads &&
## t/t1405-main-ref-store.sh ##
+@@
+
+ test_description='test main ref store api'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1405-main-ref-store.sh: test_expect_success 'peel_ref(new-tag)' '
test_cmp expected actual
'
@@ t/t1405-main-ref-store.sh: test_expect_success 'for_each_reflog()' '
## t/t1406-submodule-ref-store.sh ##
+@@
+
+ test_description='test submodule ref store api'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1406-submodule-ref-store.sh: test_expect_success 'setup' '
(
cd sub &&
@@ t/t1406-submodule-ref-store.sh: test_expect_success 'for_each_reflog()' '
## t/t1407-worktree-ref-store.sh ##
+@@
+
+ test_description='test worktree ref store api'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1407-worktree-ref-store.sh: RMAIN="test-tool ref-store worktree:main"
test_expect_success 'setup' '
@@ t/t1407-worktree-ref-store.sh: test_expect_success 'for_each_reflog()' '
'
## t/t1408-packed-refs.sh ##
+@@
+
+ test_description='packed-refs entries are covered by loose refs'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1408-packed-refs.sh: test_expect_success setup '
git commit --allow-empty -m one &&
one=$(git rev-parse HEAD) &&
@@ t/t1408-packed-refs.sh: test_expect_success setup '
'
## t/t1410-reflog.sh ##
+@@
+ #
+
+ test_description='Test prune and reflog expiration'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1410-reflog.sh: test_expect_success setup '
check_fsck &&
@@ t/t1410-reflog.sh: test_expect_success 'stale dirs do not cause d/f conflicts (r
'
## t/t1411-reflog-show.sh ##
+@@
+ #!/bin/sh
+
+ test_description='Test reflog display routines'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1411-reflog-show.sh: test_expect_success 'git log -g -p shows diffs vs. parents' '
'
@@ t/t1411-reflog-show.sh: test_expect_success 'git log -g -p shows diffs vs. paren
## t/t1413-reflog-detach.sh ##
-@@ t/t1413-reflog-detach.sh: test_description='Test reflog interaction with detached HEAD'
+@@
+ #!/bin/sh
+
+ test_description='Test reflog interaction with detached HEAD'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
reset_state () {
@@ t/t1413-reflog-detach.sh: test_expect_success 'switch to branch' '
test_cmp expect actual
## t/t1414-reflog-walk.sh ##
+@@
+ #!/bin/sh
+
+ test_description='various tests of reflog walk (log -g) behavior'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1414-reflog-walk.sh: test_expect_success 'set up some reflog entries' '
test_commit two &&
git checkout -b side HEAD^ &&
@@ t/t1414-reflog-walk.sh: test_expect_success 'walking multiple reflogs shows all'
## t/t1416-ref-transaction-hooks.sh ##
+@@
+
+ test_description='reference transaction hooks'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1416-ref-transaction-hooks.sh: test_expect_success 'hook gets all queued updates in prepared state' '
EOF
cat >expect <<-EOF &&
@@ t/t1416-ref-transaction-hooks.sh: test_expect_success 'hook gets all queued upda
test_cmp expect actual
## t/t1430-bad-ref-name.sh ##
+@@
+ #!/bin/sh
+
+ test_description='Test handling of ref names that check-ref-format rejects'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1430-bad-ref-name.sh: test_expect_success 'fast-import: fail on invalid branch name ".badbranchname"'
corrupt
COMMIT
@@ t/t1450-fsck.sh
. ./test-lib.sh
## t/t1500-rev-parse.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test git rev-parse'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1500-rev-parse.sh: test_expect_success 'showing the superproject correctly' '
test_commit -C super/dir/sub branch1_commit &&
git -C super add dir/sub &&
@@ t/t1500-rev-parse.sh: test_expect_success 'showing the superproject correctly' '
test_commit -C super branch2_commit &&
## t/t1503-rev-parse-verify.sh ##
+@@ t/t1503-rev-parse-verify.sh: test_description='test git rev-parse --verify'
+
+ exec </dev/null
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1503-rev-parse-verify.sh: test_expect_success 'works with one good rev' '
test "$rev_hash3" = "$HASH3" &&
rev_hash4=$(git rev-parse --verify $HASH4) &&
@@ t/t1503-rev-parse-verify.sh: test_expect_success 'no stdout output on error' '
test_expect_success SYMLINKS 'ref resolution not confused by broken symlinks' '
## t/t1505-rev-parse-last.sh ##
+@@
+
+ test_description='test @{-N} syntax'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1505-rev-parse-last.sh: test_expect_success 'setup' '
make_commit 3 &&
git checkout side &&
@@ t/t1505-rev-parse-last.sh: test_expect_success '@{-1}@{1} works' '
test_expect_success '@{-3} fails' '
## t/t1506-rev-parse-diagnosis.sh ##
+@@ t/t1506-rev-parse-diagnosis.sh: test_description='test git rev-parse diagnosis for invalid argument'
+
+ exec </dev/null
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1506-rev-parse-diagnosis.sh: test_expect_success 'incorrect file in :path and :N:path' '
'
@@ t/t1506-rev-parse-diagnosis.sh: test_expect_success 'incorrect file in :path and
'
## t/t1507-rev-parse-upstream.sh ##
+@@
+
+ test_description='test <branch>@{upstream} syntax'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1507-rev-parse-upstream.sh: test_expect_success 'setup' '
test_commit 1 &&
git checkout -b side &&
@@ t/t1507-rev-parse-upstream.sh: test_expect_success 'log -g other@{u}@{now}' '
Date: Thu Apr 7 15:15:13 2005 -0700
## t/t1508-at-combinations.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test various @{X} syntax combinations together'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1508-at-combinations.sh: fail() {
}
@@ t/t1508-at-combinations.sh: check "@{-1}@{1}" commit old-one
check "@@/at-test" ref refs/heads/@@/at-test
## t/t1511-rev-parse-caret.sh ##
+@@
+
+ test_description='tests for ref^{stuff}'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1511-rev-parse-caret.sh: test_expect_success 'setup' '
git commit -m Initial &&
git tag -a -m commit commit-tag &&
@@ t/t1511-rev-parse-caret.sh: test_expect_success 'ref^{tag}' '
## t/t1512-rev-parse-disambiguation.sh ##
+@@ t/t1512-rev-parse-disambiguation.sh: one tagged as v1.0.0. They all have one regular file each.
+
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1512-rev-parse-disambiguation.sh: test_expect_success 'more history' '
side=$(git rev-parse HEAD) &&
@@ t/t1512-rev-parse-disambiguation.sh: test_expect_success 'more history' '
# clean up a0blgqsjc as well. If you use resolve, merge will
## t/t1513-rev-parse-prefix.sh ##
+@@
+
+ test_description='Tests for rev-parse --prefix'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1513-rev-parse-prefix.sh: test_expect_success 'disambiguate path with valid prefix' '
'
@@ t/t1513-rev-parse-prefix.sh: test_expect_success 'disambiguate path with valid p
test_cmp expected actual
## t/t1514-rev-parse-push.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test <branch>@{push} syntax'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1514-rev-parse-push.sh: test_expect_success 'setup' '
git remote add other other.git &&
test_commit base &&
@@ t/t1514-rev-parse-push.sh: test_expect_success 'setup' '
test_expect_success 'triangular @{push} fails with default=simple' '
## t/t1700-split-index.sh ##
+@@
+
+ test_description='split index mode tests'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t1700-split-index.sh: test_expect_success 'do not refresh null base index' '
test_commit initial &&
git checkout -b side-branch &&
@@ t/t1700-split-index.sh: test_expect_success 'do not refresh null base index' '
git update-index --split-index &&
test_commit more &&
# must not write a new shareindex, or we wont catch the problem
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- *) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;;
- esac
-
-+case "$TEST_NUMBER" in
-+[01]*)
-+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-+ ;;
-+esac
-+
- # If --stress was passed, run this test repeatedly in several parallel loops.
- if test "$GIT_TEST_STRESS_STARTED" = "done"
- then
3: 0d4f1275f7 ! 4: f5dbc0d5bb t2*: adjust the references to the default branch name "main"
@@ Metadata
## Commit message ##
t2*: adjust the references to the default branch name "main"
- This trick was performed via
+ Carefully excluding t2106, which sees independent development elsewhere
+ at the time of writing, we transition above-mentioned tests to the
+ default branch name `main`. This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
- -e 's/Master/Main/g' -- t2*.sh)
+ -e 's/Master/Main/g' -- t2*.sh &&
+ git checkout HEAD -- t2106\*)
This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t2007-checkout-symlink.sh ##
+@@
+
+ test_description='git checkout to switch between branches with symlink<->dir'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2007-checkout-symlink.sh: test_expect_success setup '
echo hello >frotz/filfre &&
git add frotz/filfre &&
@@ t/t2007-checkout-symlink.sh: test_expect_success setup '
test_expect_success 'switch from dir to symlink' '
## t/t2009-checkout-statinfo.sh ##
+@@
+
+ test_description='checkout should leave clean stat info'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2009-checkout-statinfo.sh: test_expect_success 'branch switching' '
git reset --hard &&
test "$(git diff-files --raw)" = "" &&
@@ t/t2009-checkout-statinfo.sh: test_expect_success 'path checkout' '
'
## t/t2010-checkout-ambiguous.sh ##
+@@
+
+ test_description='checkout and pathspecs/refspecs ambiguities'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2010-checkout-ambiguous.sh: test_expect_success 'reference must be a tree' '
'
@@ t/t2010-checkout-ambiguous.sh: test_expect_success 'disambiguate checking out fr
'
## t/t2011-checkout-invalid-head.sh ##
+@@
+
+ test_description='checkout switching away from an invalid branch'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2011-checkout-invalid-head.sh: test_expect_success 'setup' '
'
@@ t/t2011-checkout-invalid-head.sh: test_expect_success 'pack refs' '
test_done
## t/t2012-checkout-last.sh ##
+@@
+
+ test_description='checkout can switch to last branch and merge base'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2012-checkout-last.sh: test_expect_success 'first branch switch' '
test_expect_success '"checkout -" switches back' '
@@ t/t2012-checkout-last.sh: test_expect_success 'merge base test setup' '
test_done
## t/t2015-checkout-unborn.sh ##
+@@
+ #!/bin/sh
+
+ test_description='checkout from unborn branch'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2015-checkout-unborn.sh: test_expect_success 'setup' '
git add file &&
git commit -m base
@@ t/t2015-checkout-unborn.sh: test_expect_success 'setup' '
test_expect_success 'checkout from unborn preserves untracked files' '
## t/t2017-checkout-orphan.sh ##
+@@ t/t2017-checkout-orphan.sh: test_description='git checkout --orphan
+
+ Main Tests for --orphan functionality.'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2017-checkout-orphan.sh: test_expect_success '--orphan creates a new orphan branch from HEAD' '
test_tick &&
git commit -m "Third Commit" &&
@@ t/t2017-checkout-orphan.sh: test_expect_success '--orphan with -l makes reflog w
'
## t/t2020-checkout-detach.sh ##
+@@
+ #!/bin/sh
+
+ test_description='checkout into detached HEAD state'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2020-checkout-detach.sh: check_no_orphan_warning() {
}
@@ t/t2020-checkout-detach.sh: test_expect_success 'describe_detached_head prints n
cat >1st_detach <<-EOF &&
## t/t2022-checkout-paths.sh ##
-@@ t/t2022-checkout-paths.sh: test_description='checkout $tree -- $paths'
+@@
+ #!/bin/sh
+
+ test_description='checkout $tree -- $paths'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
test_expect_success setup '
mkdir dir &&
@@ t/t2022-checkout-paths.sh: test_expect_success 'do not touch unmerged entries ma
'
## t/t2023-checkout-m.sh ##
+@@ t/t2023-checkout-m.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2023-checkout-m.sh: test_expect_success setup '
test_tick &&
test_commit both.txt both.txt initial &&
@@ t/t2024-checkout-dwim.sh: test_expect_success 'loosely defined local base branch
status_uno_is_clean &&
## t/t2027-checkout-track.sh ##
+@@
+
+ test_description='tests for git branch --track'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2027-checkout-track.sh: test_expect_success 'setup' '
'
@@ t/t2027-checkout-track.sh: test_expect_success 'setup' '
## t/t2030-unresolve-info.sh ##
+@@
+
+ test_description='undoing resolution'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2030-unresolve-info.sh: test_expect_success setup '
test_commit fourth fi/le fourth &&
git checkout add-add &&
@@ t/t2030-unresolve-info.sh: test_expect_success 'rerere forget (binary)' '
test_must_fail git merge fifth &&
## t/t2060-switch.sh ##
+@@
+
+ test_description='switch basic functionality'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2060-switch.sh: test_expect_success 'switch branch' '
'
@@ t/t2060-switch.sh: test_expect_success 'switching ignores file of same branch na
test_must_fail git switch foo &&
## t/t2070-restore.sh ##
+@@
+
+ test_description='restore basic functionality'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2070-restore.sh: test_expect_success 'setup' '
echo ignored >ignored &&
echo /ignored >.gitignore &&
@@ t/t2070-restore.sh: test_expect_success 'restore --ignore-unmerged ignores unmer
git commit -am second &&
test_must_fail git merge first &&
- ## t/t2106-update-index-assume-unchanged.sh ##
-@@ t/t2106-update-index-assume-unchanged.sh: test_expect_success 'do not switch branches with dirty file' \
- git checkout other &&
- echo dirt >file &&
- git update-index --assume-unchanged file &&
-- test_must_fail git checkout master'
-+ test_must_fail git checkout main'
-
- test_done
-
## t/t2400-worktree-add.sh ##
+@@
+
+ test_description='test git worktree add'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2400-worktree-add.sh: test_expect_success 'setup' '
test_expect_success '"add" an existing worktree' '
@@ t/t2400-worktree-add.sh: test_branch_upstream () {
"refs/heads/*:refs/remotes/$1/*" &&
## t/t2401-worktree-prune.sh ##
+@@
+
+ test_description='prune $GIT_DIR/worktrees'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2401-worktree-prune.sh: test_expect_success 'not prune recent checkouts' '
test_expect_success 'not prune proper checkouts' '
@@ t/t2401-worktree-prune.sh: test_expect_success 'not prune recent checkouts' '
'
## t/t2402-worktree-list.sh ##
+@@
+
+ test_description='test git worktree list'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2402-worktree-list.sh: test_expect_success 'rev-parse --git-common-dir on main worktree' '
test_expect_success 'rev-parse --git-path objects linked worktree' '
echo "$(git rev-parse --show-toplevel)/.git/objects" >expect &&
@@ t/t2402-worktree-list.sh: test_expect_success '"list" all worktrees --porcelain
git -C there worktree list >out &&
## t/t2405-worktree-submodule.sh ##
+@@
+
+ test_description='Combination of submodules and multiple worktrees'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t2405-worktree-submodule.sh: test_expect_success 'add superproject worktree' '
'
@@ t/t2405-worktree-submodule.sh: test_expect_success 'add superproject worktree an
grep "file1 updated" out
'
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- esac
-
- case "$TEST_NUMBER" in
--[01]*)
-+[0-2]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;; 4: aee29a0528 ! 5: 090ac6e9a1 t3[0-3]*: adjust the references to the default branch name "main"
@@ Metadata
## Commit message ##
t3[0-3]*: adjust the references to the default branch name "main"
- This trick was performed via
+ Carefully excluding t3040, which sees independent development elsewhere
+ at the time of writing, we transition above-mentioned tests to the
+ default branch name main. This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
- -e 's/Master/Main/g' -- t3[0-3]*.sh t3206/*)
+ -e 's/Master/Main/g' -- t3[0-3]*.sh t3206/* &&
+ git checkout HEAD -- t3040\*)
This allows us to define GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main for those tests.
Signed-off-by Johannes Schindelin <[email protected]>
- ## t/t3040-subprojects-basic.sh ##
-@@ t/t3040-subprojects-basic.sh: test_expect_success 'checkout in superproject' '
- '
+ ## t/t3200-branch.sh ##
+@@
- # just interesting what happened... --# git diff --name-status -M save master -+# git diff --name-status -M save main
+ test_description='git branch assorted tests'
- test_done
-
- ## t/t3200-branch.sh ## +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3200-branch.sh: test_expect_success 'branch -h in broken repository' '
(
cd broken &&
@@ t/t3200-branch.sh: test_expect_success 'option override configured sort' '
)
## t/t3201-branch-contains.sh ##
+@@
+
+ test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged' +
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3201-branch-contains.sh: test_expect_success setup '
echo 1 >file &&
@@ t/t3201-branch-contains.sh: test_expect_success 'branch --merged combined with -
EOF
## t/t3202-show-branch-octopus.sh ##
+@@
+
+ test_description='test show-branch with more than 8 heads' +
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3202-show-branch-octopus.sh: test_expect_success 'setup' '
for i in $numbers
@@ t/t3202-show-branch-octopus.sh: test_expect_success 'setup' '
test_tick &&
## t/t3203-branch-output.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git branch display tests' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3203-branch-output.sh: test_expect_success 'make remote branches' '
cat >expect <<'EOF'
branch-one
@@ t/t3203-branch-output.sh: test_expect_success '--color overrides auto-color' '
ambiguous $one one
## t/t3204-branch-name-interpretation.sh ##
+@@ t/t3204-branch-name-interpretation.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3204-branch-name-interpretation.sh: test_expect_success 'update branch via @{-1}' '
git branch previous one &&
@@ t/t3204-branch-name-interpretation.sh: test_expect_success 'disallow deleting re
expect_branch refs/remotes/origin/previous one &&
## t/t3205-branch-color.sh ##
-@@ t/t3205-branch-color.sh: test_description='basic branch output coloring' +@@
+ #!/bin/sh
+
+ test_description='basic branch output coloring' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
test_expect_success 'set up some sample branches' '
test_commit foo &&
@@ t/t3205-branch-color.sh: test_expect_success 'set up some color config' '
test_decode_color <actual.raw >actual &&
## t/t3206-range-diff.sh ##
+@@
+
+ test_description='range-diff tests'
+ +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +
+ . ./test-lib.sh
@@ t/t3206-range-diff.sh: test_expect_success 'setup' '
'
@@ t/t3206/history.export: mark :11
committer Thomas Rast <[email protected]> 1374485127 +0200
## t/t3210-pack-refs.sh ##
+@@ t/t3210-pack-refs.sh: 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 ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3210-pack-refs.sh: test_expect_success 'delete ref with dangling packed version' '
git commit --allow-empty -m "future garbage" &&
git pack-refs --all &&
@@ t/t3210-pack-refs.sh: test_expect_success 'retry acquiring packed-refs.lock' '
ln -s my-deviant-packed-refs .git/packed-refs &&
## t/t3211-peel-ref.sh ##
+@@
+ #!/bin/sh
+
+ test_description='tests for the peel_ref optimization of packed-refs' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3211-peel-ref.sh: print_ref() {
test_expect_success 'set up expected show-ref output' '
@@ t/t3301-notes.sh: test_expect_success 'git notes copy diagnoses too many or too
## t/t3302-notes-index-expensive.sh ##
+@@
+
+ test_description='Test commit notes index (expensive!)' +
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3302-notes-index-expensive.sh: create_repo () {
notemark=$(($mark+1)) test_tick &&
@@ t/t3302-notes-index-expensive.sh: create_repo () {
data <<COMMIT
## t/t3303-notes-subtrees.sh ##
+@@
+
+ test_description='Test commit notes organized in subtrees'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3303-notes-subtrees.sh: test_expect_success "setup: create $number_of_commits commits" '
nr=$(($nr+1)) &&
test_tick &&
@@ t/t3303-notes-subtrees.sh: test_concatenated_notes () {
second_note_path=$(echo "$sha1" | sed "$2")
## t/t3304-notes-mixed.sh ##
+@@
+
+ test_description='Test notes trees that also contain non-notes'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3304-notes-mixed.sh: test_expect_success "setup: create a couple of commits" '
test_tick &&
@@ t/t3308-notes-merge.sh: test_expect_success 'fail to merge into various non-note
test_must_fail git -c "core.notesRef=refs/notes/foo^{bar" notes merge x
## t/t3320-notes-merge-worktrees.sh ##
+@@
+
+ test_description='Test merging of notes trees in multiple worktrees'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3320-notes-merge-worktrees.sh: test_expect_success 'modify notes ref ourselves (x)' '
'
@@ t/t3320-notes-merge-worktrees.sh: test_expect_success 'modify notes ref ourselve
'
test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' '
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- esac
-
- case "$TEST_NUMBER" in
--[0-2]*)
-+[0-2]*|3[0-3]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
5: 041ad86e33 ! 6: c8494f4602 t3416: preemptively adjust alignment in a comment
@@ Commit message
Signed-off-by Johannes Schindelin <[email protected]>
## t/t3416-rebase-onto-threedots.sh ##
-@@ t/t3416-rebase-onto-threedots.sh: test_description='git rebase --onto A...B' +@@ t/t3416-rebase-onto-threedots.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
#
# F---G topic G'
# / /
6: 2f62b3f469 ! 7: c0d02e4d9d t34*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t3400-rebase.sh ##
+@@ t/t3400-rebase.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3400-rebase.sh: test_expect_success 'prepare repository with topic branches' '
git update-index --add Y &&
git commit -m "Add Y." &&
@@ t/t3400-rebase.sh: test_expect_success 'rebase -c rebase.useBuiltin=false warnin
## t/t3402-rebase-merge.sh ##
+@@
+
+ test_description='git rebase --merge test'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3402-rebase-merge.sh: test_expect_success setup '
git commit -m"initial" &&
git branch side &&
@@ t/t3402-rebase-merge.sh: test_expect_success '--reapply-cherry-picks refrains fr
git -C client rev-list --objects --all --missing=print >missing_list &&
## t/t3403-rebase-skip.sh ##
+@@
+
+ test_description='git rebase --merge --skip tests'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3403-rebase-skip.sh: test_expect_success setup '
'
@@ t/t3403-rebase-skip.sh: test_expect_success 'rebase moves back to skip-reference
test_expect_success 'rebase --skip with --merge' '
## t/t3405-rebase-malformed.sh ##
+@@
+
+ test_description='rebase should handle arbitrary git message'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3405-rebase-malformed.sh: test_expect_success setup '
git add file3 &&
git commit --allow-empty-message -m "" &&
@@ t/t3405-rebase-malformed.sh: test_expect_success 'rebase commit with multi-line
test_expect_success 'rebase -i commit with empty message' '
## t/t3406-rebase-message.sh ##
+@@
+
+ test_description='messages from rebase operation'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3406-rebase-message.sh: test_expect_success 'setup' '
'
@@ t/t3406-rebase-message.sh: test_expect_success 'rebase -i onto unrelated history
test_i18ngrep "5 files changed" actual
## t/t3407-rebase-abort.sh ##
+@@
+
+ test_description='git rebase --abort tests'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3407-rebase-abort.sh: testrebase() {
cd "$work_dir" &&
# Clean up the state from the previous one
@@ t/t3407-rebase-abort.sh: test_expect_success 'rebase --merge --quit' '
git rebase --quit &&
## t/t3408-rebase-multi-line.sh ##
+@@
+
+ test_description='rebasing a commit with multi-line first paragraph.'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3408-rebase-multi-line.sh: But otherwise with a sane description." side2 &&
test_expect_success rebase '
@@ t/t3408-rebase-multi-line.sh: But otherwise with a sane description." side2 &&
test_cmp expect actual
## t/t3409-rebase-preserve-merges.sh ##
+@@ t/t3409-rebase-preserve-merges.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3409-rebase-preserve-merges.sh: export GIT_AUTHOR_EMAIL
# Clone 2 (conflicting merge):
@@ t/t3409-rebase-preserve-merges.sh: test_expect_success 'setup for merge-preservi
git clone ./. clone3 &&
## t/t3412-rebase-root.sh ##
+@@ t/t3412-rebase-root.sh: test_description='git rebase --root
+
+ Tests if git rebase --root --onto <newparent> can rebase the root commit.
+ '
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3412-rebase-root.sh: test_expect_success 'prepare repository' '
test_expect_success 'rebase --root fails with too many args' '
@@ t/t3412-rebase-root.sh: EOF
## t/t3413-rebase-hook.sh ##
+@@
+
+ test_description='git rebase with its hook(s)'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3413-rebase-hook.sh: test_expect_success setup '
git add git &&
test_tick &&
@@ t/t3413-rebase-hook.sh: test_expect_success 'rebase --no-verify overrides pre-re
'
## t/t3415-rebase-autosquash.sh ##
+@@
+
+ test_description='auto squash'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3415-rebase-autosquash.sh: test_expect_success 'wrapped original subject' '
test_expect_success 'abort last squash' '
@@ t/t3415-rebase-autosquash.sh: test_expect_success 'wrapped original subject' '
git commit --allow-empty -m first &&
## t/t3416-rebase-onto-threedots.sh ##
-@@ t/t3416-rebase-onto-threedots.sh: test_description='git rebase --onto A...B'
+@@
+
+ test_description='git rebase --onto A...B'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-rebase.sh"
@@ t/t3416-rebase-onto-threedots.sh: test_expect_success 'rebase -i --keep-base mas
test_done
## t/t3418-rebase-continue.sh ##
+@@
+
+ test_description='git rebase --continue tests'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3418-rebase-continue.sh: test_expect_success 'setup' '
git checkout -b topic HEAD^ &&
test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
@@ t/t3418-rebase-continue.sh: test_rerere_autoupdate () {
git add F2 &&
## t/t3419-rebase-patch-id.sh ##
+@@
+
+ test_description='git rebase - test patch id computation'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3419-rebase-patch-id.sh: test_expect_success 'setup' '
test_expect_success 'setup: 500 lines' '
@@ t/t3419-rebase-patch-id.sh: test_expect_success 'setup attributes' '
git commit -q -m squashed &&
## t/t3420-rebase-autostash.sh ##
+@@
+ #
+
+ test_description='git rebase --autostash tests'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3420-rebase-autostash.sh: test_expect_success setup '
git add . &&
test_tick &&
@@ t/t3423-rebase-reword.sh: test_expect_success 'reword after a conflict preserves
git add file-2 &&
## t/t3427-rebase-subtree.sh ##
+@@ t/t3427-rebase-subtree.sh: test_description='git rebase tests for -Xsubtree
+
+ This test runs git rebase and tests the subtree strategy.
+ '
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3427-rebase-subtree.sh: commit_message() {
#
# topic_1 - topic_2 - topic_3
@@ t/t3430-rebase-merges.sh: Initial setup:
\ \ /
\ F - G (second)
\
+ Conflicting-G
+ '
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3430-rebase-merges.sh: test_expect_success 'setup' '
git checkout -b first &&
test_commit B &&
@@ t/t3430-rebase-merges.sh: test_expect_success 'labels that are object IDs are re
git commit -m "Merge commit '\''$third'\'' into labels" &&
## t/t3431-rebase-fork-point.sh ##
-@@ t/t3431-rebase-fork-point.sh: test_description='git rebase --fork-point test'
+@@
+
+ test_description='git rebase --fork-point test'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ t/t3431-rebase-fork-point.sh: test_rebase 'G F C E D B A' --no-fork-point
git tag one &&
## t/t3432-rebase-fast-forward.sh ##
+@@
+
+ test_description='ensure rebase fast-forwards commits when possible'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3432-rebase-fast-forward.sh: test_rebase_same_head_ () {
changes='no changes'
@@ t/t3434-rebase-i18n.sh: test_description='rebase with changing encoding
\
3 - 4 first
\
+ 5 - 6 second
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3434-rebase-i18n.sh: test_expect_success 'rebase --rebase-merges update encoding eucJP to UTF-8' '
git config i18n.commitencoding eucJP &&
git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
@@ t/t3434-rebase-i18n.sh: test_rebase_continue_update_encode () {
git add two.t &&
## t/t3435-rebase-gpg-sign.sh ##
+@@
+
+ test_description='test rebase --[no-]gpg-sign'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3435-rebase-gpg-sign.sh: test_expect_success 'setup: merge commit' '
test_commit fork-point &&
git switch -c side &&
@@ t/t3436-rebase-more-options.sh: test_expect_success 'setup' '
rm foo &&
test_write_lines "line 1" " line 2" "line 3" >file &&
git commit -am "add file" &&
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- esac
-
- case "$TEST_NUMBER" in
--[0-2]*|3[0-3]*)
-+3404)
-+ # Avoid conflicts with patch series that are cooking at the same time
-+ # as the patch series changing the default of `init.defaultBranch`.
-+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-+ ;;
-+[0-2]*|3[0-4]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
7: 0cf754646e ! 8: db3a104750 t3[5-9]*: adjust the references to the default branch name "main"
@@ t/t3500-cherry.sh
+This test cherry-picks one local change of two into main branch, and
checks that git cherry only returns the second patch in the local branch
'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
@@ t/t3500-cherry.sh: test_expect_success \
test_tick &&
@@ t/t3500-cherry.sh: test_expect_success \
test_expect_success 'cherry ignores whitespace' '
## t/t3501-revert-cherry-pick.sh ##
+@@ t/t3501-revert-cherry-pick.sh: test_description='test cherry-pick and revert with renames
+
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3501-revert-cherry-pick.sh: test_expect_success 'cherry-pick on unborn branch' '
test_expect_success 'cherry-pick "-" to pick from previous branch' '
git checkout unborn &&
@@ t/t3501-revert-cherry-pick.sh: test_expect_success 'cherry-pick "-" is meaningle
git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
## t/t3502-cherry-pick-merge.sh ##
+@@ t/t3502-cherry-pick-merge.sh: test_description='cherry picking and reverting a merge
+
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3502-cherry-pick-merge.sh: test_expect_success setup '
echo new line >B &&
git commit -m "add line to B" B &&
@@ t/t3502-cherry-pick-merge.sh: test_expect_success setup '
## t/t3503-cherry-pick-root.sh ##
+@@
+
+ test_description='test cherry-picking (and reverting) a root commit'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3503-cherry-pick-root.sh: test_expect_success setup '
test_expect_success 'cherry-pick a root commit' '
@@ t/t3503-cherry-pick-root.sh: test_expect_success 'cherry-pick two root commits'
test_cmp expect.file2 file2 &&
## t/t3504-cherry-pick-rerere.sh ##
-@@ t/t3504-cherry-pick-rerere.sh: test_description='cherry-pick should rerere for conflicts'
+@@
+
+ test_description='cherry-pick should rerere for conflicts'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
test_expect_success setup '
test_commit foo &&
@@ t/t3504-cherry-pick-rerere.sh: test_expect_success 'cherry-pick --continue rejec
test_done
## t/t3505-cherry-pick-empty.sh ##
+@@
+
+ test_description='test cherry-picking an empty commit'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3505-cherry-pick-empty.sh: test_expect_success setup '
test_tick &&
git commit --allow-empty-message -m "" &&
@@ t/t3505-cherry-pick-empty.sh: test_expect_success 'cherry-pick a commit that bec
## t/t3506-cherry-pick-ff.sh ##
+@@
+
+ test_description='test cherry-picking with --ff option'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3506-cherry-pick-ff.sh: test_expect_success setup '
'
@@ t/t3506-cherry-pick-ff.sh: test_expect_success 'merge setup' '
git checkout -b new A
## t/t3507-cherry-pick-conflict.sh ##
+@@ t/t3507-cherry-pick-conflict.sh: test_description='test cherry-pick and revert with conflicts
+
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3507-cherry-pick-conflict.sh: test_expect_success setup '
test_commit redundant-pick foo c redundant &&
git commit --allow-empty --allow-empty-message &&
@@ t/t3507-cherry-pick-conflict.sh: test_expect_success setup '
'
## t/t3508-cherry-pick-many-commits.sh ##
+@@
+
+ test_description='test cherry-picking many commits'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3508-cherry-pick-many-commits.sh: test_expect_success setup '
'
@@ t/t3508-cherry-pick-many-commits.sh: test_expect_success 'cherry-pick -3 fourth
git rev-list --reverse first..fourth | git cherry-pick --stdin &&
## t/t3509-cherry-pick-merge-df.sh ##
+@@
+ #!/bin/sh
+
+ test_description='Test cherry-pick with directory/file conflicts'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3509-cherry-pick-merge-df.sh: test_expect_success 'Setup rename across paths each below D/F conflicts' '
test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' '
@@ t/t3509-cherry-pick-merge-df.sh: test_expect_success 'Setup rename across paths
## t/t3512-cherry-pick-submodule.sh ##
+@@
+
+ test_description='cherry-pick can handle submodules'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3512-cherry-pick-submodule.sh: test_expect_success 'unrelated submodule/file conflict is ignored' '
git add a_file &&
git commit -m "modify a file" &&
@@ t/t3512-cherry-pick-submodule.sh: test_expect_success 'unrelated submodule/file
git submodule update sub &&
## t/t3600-rm.sh ##
+@@
+
+ test_description='Test of the various options to git rm.'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3600-rm.sh: test_expect_success 'setup submodule conflict' '
echo 1 >nitfol &&
git add nitfol &&
@@ t/t3600-rm.sh: test_expect_success 'checking out a commit after submodule remova
echo "?? submod/" >expected &&
## t/t3701-add-interactive.sh ##
+@@
+ #!/bin/sh
+
+ test_description='add -i basic tests'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3701-add-interactive.sh: test_expect_success 'patch mode ignores unmerged entries' '
test_commit non-conflict &&
git checkout -b side &&
@@ t/t3701-add-interactive.sh: test_expect_success 'patch mode ignores unmerged ent
echo y | git add -p >output &&
## t/t3901-i18n-patch.sh ##
+@@
+
+ test_description='i18n settings and format-patch | am pipe'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3901-i18n-patch.sh: test_expect_success setup '
# the first commit on the side branch is UTF-8
@@ t/t3901-i18n-patch.sh: test_expect_success !MINGW 'am (L/U)' '
git am out-u1 out-u2 &&
## t/t3903-stash.sh ##
+@@
+
+ test_description='Test git stash'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3903-stash.sh: test_expect_success 'stash branch' '
git commit file -m second &&
git stash branch stashbranch &&
@@ t/t3903-stash.sh: test_expect_success 'create with multiple arguments for the me
git add foo &&
## t/t3910-mac-os-precompose.sh ##
+@@
+
+ test_description='utf-8 decomposed (nfd) converted to precomposed (nfc)'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t3910-mac-os-precompose.sh: test_expect_success "git checkout link nfd" '
git checkout l.$Odiarnfd
'
@@ t/t3910-mac-os-precompose.sh: test_expect_success "Add long decomposed filename"
git reset --hard &&
git checkout -b mac_os_long_nfc_fn
'
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TEST_NUMBER" in
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-2]*|3[0-4]*)
-+[0-3]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
8: cf6c1d1d83 ! 9: 0164eb9745 t4*: adjust the references to the default branch name "main"
@@ Metadata
## Commit message ##
t4*: adjust the references to the default branch name "main"
- Carefully excluding t4013, which sees independent development elsewhere
- at the time of writing, we use `main` as the default branch name in t4*.
- This trick was performed via
+ Carefully excluding t4013 and t4015, which see independent development
+ elsewhere at the time of writing, we use `main` as the default branch
+ name in t4*. This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t4014-format-patch.sh ##
+@@
+
+ test_description='various format-patch tests'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4014-format-patch.sh: test_expect_success setup '
test_tick &&
git commit -m "Side changes #3 with \\n backslash-n in it." &&
@@ t/t4014-format-patch.sh: test_expect_success 'format-patch --pretty=mboxrd' '
test_commit fleep blorp
'
- ## t/t4015-diff-whitespace.sh ##
-@@ t/t4015-diff-whitespace.sh: test_expect_success 'combined diff with autocrlf conversion' '
- echo >x goodbye &&
- git commit -m "the other side" x &&
- git config core.autocrlf true &&
-- test_must_fail git merge master &&
-+ test_must_fail git merge main &&
-
- git diff >actual.raw &&
- sed -e "1,/^@@@/d" actual.raw >actual &&
-
## t/t4017-diff-retval.sh ##
+@@
+
+ test_description='Return value of diffs'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4017-diff-retval.sh: test_expect_success 'check detects leftover conflict markers' '
git checkout HEAD^ &&
echo binary >>b &&
@@ t/t4017-diff-retval.sh: test_expect_success 'check detects leftover conflict mar
test 3 = $(grep "conflict marker" test.out | wc -l) &&
## t/t4038-diff-combined.sh ##
+@@
+
+ test_description='combined diff'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4038-diff-combined.sh: test_expect_success 'check --cc --raw with forty trees' '
'
@@ t/t4038-diff-combined.sh: test_expect_success 'combine diff gets tree sorting ri
printf "MM\tfoo\n" >expect &&
## t/t4041-diff-submodule-option.sh ##
+@@ t/t4041-diff-submodule-option.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4041-diff-submodule-option.sh: test_expect_success 'diff --submodule with objects referenced by alternates' '
(cd super &&
(cd sub &&
@@ t/t4041-diff-submodule-option.sh: test_expect_success 'diff --submodule with obj
) &&
## t/t4048-diff-combined-binary.sh ##
+@@
+ #!/bin/sh
+
+ test_description='combined and merge diff handle binary files and textconv'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4048-diff-combined-binary.sh: test_expect_success 'setup binary merge conflict' '
echo threeQ3 | q_to_nul >binary &&
git commit -a -m three &&
@@ t/t4048-diff-combined-binary.sh: index $three,$two..0000000
'
## t/t4052-stat-output.sh ##
+@@
+
+ test_description='test --stat output of various commands'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4052-stat-output.sh: cat >expect <<'EOF'
EOF
test_expect_success 'merge --stat respects COLUMNS (big change)' '
@@ t/t4052-stat-output.sh: cat >expect <<'EOF'
'
## t/t4056-diff-order.sh ##
+@@
+
+ test_description='diff order'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4056-diff-order.sh: done
test_expect_success 'setup for testing combine-diff order' '
git checkout -b tmp HEAD~ &&
@@ t/t4056-diff-order.sh: done
'
## t/t4057-diff-combined-paths.sh ##
+@@
+
+ test_description='combined diff show only paths that are different to all parents'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4057-diff-combined-paths.sh: test_expect_success 'trivial merge - combine-diff empty' '
echo $i/2 >>$i.txt
done &&
@@ t/t4057-diff-combined-paths.sh: test_expect_success 'merge removed a file' '
git commit --amend &&
## t/t4061-diff-indent.sh ##
+@@
+ test_description='Test diff indent heuristic.
+
+ '
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4061-diff-indent.sh: test_expect_success 'diff-index: nice spaces with --indent-heuristic' '
git reset --soft HEAD~ &&
git diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted &&
@@ t/t4061-diff-indent.sh: test_expect_success 'diff-files: --no-indent-heuristic o
test_done
## t/t4066-diff-emit-delay.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test combined/stat/moved interaction'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4066-diff-emit-delay.sh: test_expect_success 'set up history with a merge' '
test_commit B &&
git checkout -b side HEAD^ &&
@@ t/t4066-diff-emit-delay.sh: test_expect_success 'set up history with a merge' '
## t/t4068-diff-symmetric-merge-base.sh ##
-@@ t/t4068-diff-symmetric-merge-base.sh: test_description='behavior of diff with symmetric-diff setups and --merge-base'
+@@
+
+ test_description='behavior of diff with symmetric-diff setups and --merge-base'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
# build these situations:
# - normal merge with one merge base (br1...b2r);
@@ t/t4068-diff-symmetric-merge-base.sh: do
## t/t4103-apply-binary.sh ##
+@@
+ test_description='git apply handling binary patches
+
+ '
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4103-apply-binary.sh: test_expect_success 'setup' '
git update-index --add --remove file1 file2 file3 file4 &&
git commit -m "Second Version" &&
@@ t/t4103-apply-binary.sh: test_expect_success 'check binary diff with replacement
test_expect_success 'apply binary diff -- should fail.' \
## t/t4108-apply-threeway.sh ##
+@@
+
+ test_description='git apply --3way'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4108-apply-threeway.sh: test_expect_success setup '
test_tick &&
test_write_lines 1 two 3 4 5 six 7 >one &&
@@ t/t4108-apply-threeway.sh: test_expect_success 'apply with --3way with rerere en
# but rerere should have replayed the recorded resolution
## t/t4121-apply-diffs.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git apply for contextually independent diffs'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4121-apply-diffs.sh: test_expect_success 'setup' \
git commit -a -q -m 2 &&
echo 9 >>file &&
@@ t/t4121-apply-diffs.sh: test_expect_success 'setup' \
'check if contextually independent diffs for the same file apply' \
## t/t4122-apply-symlink-inside.sh ##
+@@
+ #!/bin/sh
+
+ test_description='apply to deeper directory without getting fooled with symlink'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4122-apply-symlink-inside.sh: test_expect_success apply '
test_expect_success 'check result' '
@@ t/t4122-apply-symlink-inside.sh: test_expect_success apply '
## t/t4150-am.sh ##
+@@
+
+ test_description='git am running'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4150-am.sh: test_expect_success setup '
test_tick &&
git commit -m "added another file" &&
@@ t/t4200-rerere.sh: test_description='git rerere
+++++++ [main] initial
'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
@@ t/t4200-rerere.sh: test_expect_success 'setup' '
test_tick &&
@@ t/t4200-rerere.sh: test_expect_success 'setup simple stage 1 handling' '
)
## t/t4201-shortlog.sh ##
+@@
+ test_description='git shortlog
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4201-shortlog.sh: test_expect_success 'shortlog with revision pseudo options' '
'
@@ t/t4201-shortlog.sh: test_expect_success 'shortlog with revision pseudo options'
'
## t/t4202-log.sh ##
+@@
+
+ test_description='git log'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4202-log.sh: test_expect_success 'set up merge history' '
git checkout -b side HEAD~4 &&
test_commit side-1 1 1 &&
@@ t/t4202-log.sh: test_expect_success 'log diagnoses bogus HEAD' '
echo "ref: refs/heads/invalid.lock" >empty/.git/HEAD &&
## t/t4203-mailmap.sh ##
+@@
+
+ test_description='.mailmap configurations'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4203-mailmap.sh: test_expect_success 'No mailmap files, but configured' '
test_expect_success 'setup mailmap blob tests' '
@@ t/t4203-mailmap.sh: test_expect_success 'No mailmap files, but configured' '
EOF
## t/t4204-patch-id.sh ##
+@@
+
+ test_description='git patch-id'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4204-patch-id.sh: test_expect_success 'setup' '
test_write_lines $as b >foo &&
test_write_lines $as b >bar &&
@@ t/t4204-patch-id.sh: test_expect_success '--stable overrides patchid.stable = fa
test_expect_success 'patch-id respects config from subdir' '
## t/t4207-log-decoration-colors.sh ##
+@@
+
+ test_description='Test for "git log --decorate" colors'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4207-log-decoration-colors.sh: test_expect_success setup '
cat >expected <<EOF
@@ t/t4207-log-decoration-colors.sh: test_expect_success setup '
## t/t4208-log-magic-pathspec.sh ##
+@@
+
+ test_description='magic pathspec tests using git-log'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4208-log-magic-pathspec.sh: test_expect_success '"git log :/a -- " should not be ambiguous' '
'
@@ t/t4208-log-magic-pathspec.sh: test_expect_success 'command line pathspec parsin
git log --merge -- a
'
+ ## t/t4211-line-log.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test log -L'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
+
## t/t4211/history.export ##
@@ t/t4211/history.export: long f(long x)
return s;
@@ t/t4211/history.export: long f(long x)
committer Thomas Rast <[email protected]> 1362045024 +0100
## t/t4214-log-graph-octopus.sh ##
+@@
+
+ test_description='git log --graph of skewed left octopus merge.'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4214-log-graph-octopus.sh: test_cmp_colored_graph () {
test_expect_success 'set up merge history' '
test_commit initial &&
@@ t/t4214-log-graph-octopus.sh: test_cmp_colored_graph () {
test_commit $i $i $i tag$i || return $?
## t/t4216-log-bloom.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git log for a path with Bloom filters'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4216-log-bloom.sh: test_expect_success 'setup test - repo, commits, commit graph, log outputs' '
test_commit c10 file_to_be_deleted &&
git checkout -b side HEAD~4 &&
@@ t/t4216-log-bloom.sh: do
test_bloom_filters_used "$option -- $path" &&
## t/t4253-am-keep-cr-dos.sh ##
+@@
+ test_description='git-am mbox with dos line ending.
+
+ '
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t4253-am-keep-cr-dos.sh: test_expect_success 'setup repository with dos files' '
test_expect_success 'am with dos files without --keep-cr' '
@@ t/t4257-am-interactive.sh: test_expect_success 'set up patches to apply' '
'
# Sanity check our setup.
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- esac
-
- case "$TEST_NUMBER" in
--3404)
-+3404|4013)
- # Avoid conflicts with patch series that are cooking at the same time
- # as the patch series changing the default of `init.defaultBranch`.
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-3]*)
-+[0-4]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
9: 6ff4594a28 = 10: 36d633a5ec t5323: prepare centered comment for `master` -> `main`
10: be29e07892 ! 11: d9d1d14681 t5[0-4]*: adjust the references to the default branch name "main"@@ Commit message
Signed-off-by Johannes Schindelin <[email protected]>
## t/t5150-request-pull.sh ##
+@@
+
+ test_description='Test workflows involving pull request.'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5150-request-pull.sh: test_expect_success 'setup' '
test_tick &&
git commit -m "\"Thirty days\", a reminder of month lengths" &&
@@ t/t5150-request-pull.sh: test_expect_success 'pull request with stale object' '
test_must_fail git request-pull initial "$downstream_url" tags/full \
## t/t5304-prune.sh ##
+@@
+ #
+
+ test_description='prune'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5304-prune.sh: test_expect_success 'prune: do not prune detached HEAD with no reflog' '
test_expect_success 'prune: prune former HEAD after checking out branch' '
@@ t/t5304-prune.sh: test_expect_success 'prune: do not prune detached HEAD with no
## t/t5305-include-tag.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git pack-object --include-tag' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5305-include-tag.sh: test_expect_success 'check unpacked result (have all objects)' '
test_expect_success 'single-branch clone can transfer tag' '
@@ t/t5305-include-tag.sh: test_expect_success 'check unpacked result (have all obj
## t/t5312-prune-corruption.sh ##
+@@ t/t5312-prune-corruption.sh: 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 ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5312-prune-corruption.sh: test_expect_success 'disable reflogs' '
'
@@ t/t5312-prune-corruption.sh: test_expect_success 'pack-refs does not silently de
## t/t5317-pack-objects-filter-objects.sh ##
+@@
+
+ test_description='git pack-objects using object filtering'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5317-pack-objects-filter-objects.sh: test_expect_success 'verify sparse:oid=oid-ish' '
awk -f print_2.awk ls_files_result |
sort >expected &&
@@ t/t5317-pack-objects-filter-objects.sh: test_expect_success 'verify sparse:oid=o
git -C r4 index-pack ../filter.pack &&
## t/t5322-pack-objects-sparse.sh ##
+@@
+ #!/bin/sh
+
+ test_description='pack-objects object selection using sparse algorithm' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5322-pack-objects-sparse.sh: test_expect_success 'setup repo' '
git commit -m "Initialized trees" &&
for i in $(test_seq 1 3)
@@ t/t5323-pack-redundant.sh: test_expect_success 'shared: one pack is redundant wi
# P1 | x x x x x x x x |
## t/t5400-send-pack.sh ##
+@@
+ test_description='See why rewinding head breaks send-pack
+
+ '
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5400-send-pack.sh: test_expect_success 'pack the destination repository' '
'
@@ t/t5401-update-hooks.sh: test_expect_success 'pre-receive hook that forgets to r
'
## t/t5402-post-merge-hook.sh ##
+@@
+ #
+
+ test_description='Test the post-merge hook.' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5402-post-merge-hook.sh: test_expect_success setup '
git update-index a &&
tree1=$(git write-tree) &&
@@ t/t5402-post-merge-hook.sh: test_expect_success setup '
git clone ./. clone2 &&
## t/t5403-post-checkout-hook.sh ##
+@@
+ #
+
+ test_description='Test the post-checkout hook.' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5403-post-checkout-hook.sh: test_expect_success setup '
test_expect_success 'post-checkout receives the right arguments with HEAD unchanged ' '
@@ t/t5403-post-checkout-hook.sh: test_expect_success 'post-checkout receives the r
read old new flag <.git/post-checkout.args &&
## t/t5404-tracking-branches.sh ##
+@@
+
+ test_description='tracking branch update checks for git push'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5404-tracking-branches.sh: test_expect_success 'prepare pushable branches' '
git checkout -b b2 origin/b2 &&
echo aa-b2 >>file &&
@@ t/t5404-tracking-branches.sh: test_expect_success 'mixed-success push returns er
test_expect_success 'check tracking branches not updated for failed refs' '
## t/t5405-send-pack-rewind.sh ##
+@@
+
+ test_description='forced push to replace commit we do not have'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5405-send-pack-rewind.sh: test_expect_success setup '
mkdir another && (
cd another &&
@@ t/t5405-send-pack-rewind.sh: test_expect_success 'forced push should succeed' '
'
## t/t5407-post-rewrite-hook.sh ##
+@@
+ #
+
+ test_description='Test the post-rewrite hook.' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5407-post-rewrite-hook.sh: test_expect_success 'setup' '
git checkout A^0 &&
test_commit E bar E &&
@@ t/t5407-post-rewrite-hook.sh: test_expect_success 'setup' '
mkdir .git/hooks
## t/t5410-receive-pack-alternates.sh ##
-@@ t/t5410-receive-pack-alternates.sh: test_description='git receive-pack with alternate ref filtering' +@@
+
+ test_description='git receive-pack with alternate ref filtering'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
+@@ t/t5410-receive-pack-alternates.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
test_expect_success 'setup' '
test_commit base &&
git clone -s --bare . fork &&
@@ t/t5410-receive-pack-alternates.sh: test_description='git receive-pack with alte
test_commit private
'
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- esac
-
- case "$TEST_NUMBER" in
--3404|4013)
-+3404|4013|5310)
- # Avoid conflicts with patch series that are cooking at the same time
- # as the patch series changing the default of init.defaultBranch.
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-4]*)
-+[0-4]*|5[0-4]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
11: 5126d90a32 ! 12: f7a9bc07c7 t5503: prepare aligned comment for replacing master with main
@@ Commit message
Signed-off-by Johannes Schindelin <[email protected]>
## t/t5503-tagfollow.sh ##
-@@ t/t5503-tagfollow.sh: test_description='test automatic tag following' +@@ t/t5503-tagfollow.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
# L - A ------ O ------ B
# \ \ \
# \ C - origin/cat \
12: 332677cbf9 ! 13: 4d7eb7dc28 t550*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t5500-fetch-pack.sh ##
+@@
+
+ test_description='Testing multi_ack pack fetching'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5500-fetch-pack.sh: test_expect_success 'in_vain resetted upon ACK' '
rm -rf myserver myclient &&
git init myserver &&
@@ t/t5500-fetch-pack.sh: test_expect_success 'fetching deepen' '
three
## t/t5501-fetch-push-alternates.sh ##
+@@
+ #!/bin/sh
+
+ test_description='fetch/push involving alternates'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5501-fetch-push-alternates.sh: test_expect_success setup '
test_expect_success 'pushing into a repository with the same alternate' '
(
@@ t/t5501-fetch-push-alternates.sh: test_expect_success 'pushing into a repository
test_cmp one.count fetcher.count
## t/t5502-quickfetch.sh ##
+@@
+
+ test_description='test quickfetch from local'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5502-quickfetch.sh: test_expect_success 'quickfetch should not copy from alternate' '
q
}"
@@ t/t5502-quickfetch.sh: test_expect_success 'quickfetch should not copy from alte
## t/t5503-tagfollow.sh ##
-@@ t/t5503-tagfollow.sh: test_description='test automatic tag following'
+@@
+
+ test_description='test automatic tag following'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
+@@ t/t5503-tagfollow.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
# L - A ------ O ------ B
# \ \ \
# \ C - origin/cat \
@@ t/t5503-tagfollow.sh: test_expect_success 'new clone fetch master and tags' '
test $T = $(git rev-parse --verify tag1) &&
## t/t5504-fetch-receive-strict.sh ##
+@@
+ #!/bin/sh
+
+ test_description='fetch/receive strict mode'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5504-fetch-receive-strict.sh: test_expect_success 'fetch without strict' '
cd dst &&
git config fetch.fsckobjects false &&
@@ t/t5504-fetch-receive-strict.sh: test_expect_success 'push with transfer.fsckobj
## t/t5505-remote.sh ##
+@@
+
+ test_description='git remote porcelain-ish'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5505-remote.sh: setup_repository () {
git add elif &&
test_tick &&
@@ t/t5505-remote.sh: test_expect_success 'unqualified <dst> refspec DWIM and advic
) &&
## t/t5506-remote-groups.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git remote group handling'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5506-remote-groups.sh: repo_fetched() {
test_expect_success 'setup' '
mkdir one && (cd one && git init) &&
@@ t/t5506-remote-groups.sh: repo_fetched() {
test_expect_success 'no group updates all' '
## t/t5509-fetch-push-namespaces.sh ##
+@@
+ #!/bin/sh
+
+ test_description='fetch/push involving ref namespaces'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5509-fetch-push-namespaces.sh: test_expect_success setup '
test_expect_success 'pushing into a repository using a ref namespace' '
(
@@ t/t5509-fetch-push-namespaces.sh: test_expect_success 'denyCurrentBranch and unb
)
'
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TEST_NUMBER" in
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-4]*|5[0-4]*)
-+[0-4]*|5[0-4]*|550*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
13: b7333ef201 ! 14: 88b2c30cc8 t551*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t5510-fetch.sh ##
+@@ t/t5510-fetch.sh: test_description='Per branch config variables affects "git fetch".
+
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5510-fetch.sh: test_expect_success "clone and setup child repos" '
git clone . two &&
(
@@ t/t5511-refspec.sh: test_refspec push 'refs/heads/master:refs/remotes/frotz/xyzz
## t/t5512-ls-remote.sh ##
+@@
+
+ test_description='git ls-remote'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5512-ls-remote.sh: test_expect_success 'use branch.<name>.remote if possible' '
echo "From $URL" >exp_err &&
@@ t/t5512-ls-remote.sh: test_expect_success 'ls-remote --sort fails gracefully out
## t/t5514-fetch-multiple.sh ##
+@@
+
+ test_description='fetch --all works correctly'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5514-fetch-multiple.sh: setup_repository () {
git add elif &&
test_tick &&
@@ t/t5514-fetch-multiple.sh: test_expect_success 'git fetch --all (skipFetchAll)'
## t/t5516-fetch-push.sh ##
+@@ t/t5516-fetch-push.sh: This test checks the following functionality:
+ * reflogs
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5516-fetch-push.sh: test_expect_success setup '
git add path1 &&
test_tick &&
@@ t/t5516-fetch-push.sh: test_expect_success 'updateInstead with push-to-checkout
git diff --quiet &&
## t/t5517-push-mirror.sh ##
+@@
+
+ test_description='pushing to a mirror repository'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5517-push-mirror.sh: invert () {
}
@@ t/t5517-push-mirror.sh: test_expect_success 'remote.foo.mirror=no has no effect'
## t/t5518-fetch-exit-status.sh ##
+@@
+
+ test_description='fetch exit status test'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5518-fetch-exit-status.sh: test_expect_success setup '
echo side >file &&
git commit -a -m side &&
@@ t/t5518-fetch-exit-status.sh: test_expect_success setup '
## t/t5519-push-alternates.sh ##
+@@
+
+ test_description='push to a repository that borrows from elsewhere'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5519-push-alternates.sh: test_expect_success setup '
>file &&
git add . &&
@@ t/t5519-push-alternates.sh: test_expect_success 'alice works and pushes yet agai
# at a commit Bob does not fully know about, but
# he happens to have the commit object (but not the
# necessary tree) in his repository from Alice.
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TEST_NUMBER" in
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-4]*|5[0-4]*|550*)
-+[0-4]*|5[0-4]*|55[01]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
14: 4b1b1ee51f ! 15: 3b73811af4 t55[23]*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t5520-pull.sh ##
+@@
+
+ test_description='pulling into void'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5520-pull.sh: test_expect_success 'pulling into void' '
test_cmp file cloned/file
'
@@ t/t5520-pull.sh: test_expect_success 'setup for avoiding reapplying old patches'
rm -rf src &&
## t/t5521-pull-options.sh ##
+@@
+
+ test_description='pull options'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5521-pull-options.sh: test_expect_success 'git pull --force' '
cat >>.git/config <<-\EOF &&
[remote "one"]
@@ t/t5521-pull-options.sh: test_expect_success 'git pull --all --dry-run' '
)
## t/t5523-push-upstream.sh ##
+@@
+ #!/bin/sh
+
+ test_description='push with --set-upstream'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5523-push-upstream.sh: check_config() {
test_cmp expect.$1 actual.$1
}
@@ t/t5523-push-upstream.sh: test_expect_success TTY 'push --no-progress suppresses
## t/t5527-fetch-odd-refs.sh ##
-@@ t/t5527-fetch-odd-refs.sh: test_description='test fetching of oddly-named refs'
+@@
+ #!/bin/sh
+
+ test_description='test fetching of oddly-named refs'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
# afterwards we will have:
# HEAD - two
@@ t/t5527-fetch-odd-refs.sh: test_expect_success LONG_REF 'fetch handles extremely
## t/t5528-push-default.sh ##
+@@
+ #!/bin/sh
+
+ test_description='check various push.default settings'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5528-push-default.sh: test_push_failure () {
# $1 = success or failure
@@ t/t5530-upload-pack-error.sh: test_expect_success 'create empty repository' '
## t/t5531-deep-submodule-push.sh ##
+@@
+
+ test_description='test push with submodules'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5531-deep-submodule-push.sh: test_expect_success setup '
test_expect_success 'push works with recorded gitlink' '
(
@@ t/t5531-deep-submodule-push.sh: test_expect_success 'push propagating refspec to
git -C submodule.git rev-parse branch2 >actual_submodule &&
## t/t5533-push-cas.sh ##
+@@
+
+ test_description='compare & swap push force/delete safety'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5533-push-cas.sh: setup_src_dup_dst () {
(
cd dup &&
@@ t/t5533-push-cas.sh: test_expect_success '"--force-if-includes" should allow for
## t/t5534-push-signed.sh ##
+@@
+
+ test_description='signed push'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5534-push-signed.sh: prepare_dst () {
rm -fr dst &&
test_create_repo dst &&
@@ t/t5534-push-signed.sh: prepare_dst () {
## t/t5537-fetch-shallow.sh ##
+@@
+
+ test_description='fetch/clone from a shallow clone'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5537-fetch-shallow.sh: test_expect_success 'fetch from shallow clone' '
cd shallow2 &&
git fetch &&
@@ t/t5537-fetch-shallow.sh: test_expect_success 'shallow fetches check connectivit
! test -e "$HTTPD_ROOT_PATH/one-time-perl" &&
## t/t5538-push-shallow.sh ##
+@@
+
+ test_description='push from/to a shallow clone'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5538-push-shallow.sh: test_expect_success 'push from shallow clone' '
(
cd shallow &&
@@ t/t5538-push-shallow.sh: EOF
1
## t/t5539-fetch-http-shallow.sh ##
+@@
+
+ test_description='fetch/clone from a shallow clone over http'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5539-fetch-http-shallow.sh: test_expect_success 'clone http repository' '
(
cd clone &&
@@ t/t5539-fetch-http-shallow.sh: test_expect_success 'fetching deepen' '
cat >expected <<-\EOF &&
four
three
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- esac
-
- case "$TEST_NUMBER" in
--3404|4013|5310)
-+3404|4013|5310|5526)
- # Avoid conflicts with patch series that are cooking at the same time
- # as the patch series changing the default of `init.defaultBranch`.
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-4]*|5[0-4]*|55[01]*)
-+[0-4]*|5[0-4]*|55[0-3]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
15: c37d97c2d8 ! 16: 5c57fbe695 t55[4-9]*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t5540-http-push-webdav.sh ##
+@@ t/t5540-http-push-webdav.sh: test_description='test WebDAV http-push
+
+ This test runs various sanity checks on http-push.'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5540-http-push-webdav.sh: test_expect_success 'push already up-to-date' '
test_expect_success 'push to remote repository with unpacked refs' '
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
@@ t/t5540-http-push-webdav.sh: test_expect_success 'PUT and MOVE sends object to U
test_commit pw-user &&
## t/t5541-http-push-smart.sh ##
+@@
+ #
+
+ test_description='test smart pushing over http via http-backend'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5541-http-push-smart.sh: test_expect_success 'used receive-pack service' '
'
@@ t/t5541-http-push-smart.sh: test_expect_success 'colorize errors/hints' '
test_i18ngrep "<RED>error: failed to push some refs" decoded &&
## t/t5542-push-http-shallow.sh ##
+@@
+
+ test_description='push from/to a shallow clone over http'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5542-push-http-shallow.sh: test_expect_success 'push to shallow repo via http' '
(
cd full &&
@@ t/t5542-push-http-shallow.sh: test_expect_success 'push from shallow repo via ht
4
## t/t5543-atomic-push.sh ##
+@@
+
+ test_description='pushing to a repository using the atomic push option'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5543-atomic-push.sh: test_expect_success 'atomic push works for a single branch' '
test_commit one &&
git push --mirror up &&
@@ t/t5543-atomic-push.sh: test_expect_success 'atomic push reports (mirror, but re
test_cmp expect actual
## t/t5545-push-options.sh ##
+@@
+
+ test_description='pushing to a repository using push options'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5545-push-options.sh: test_expect_success 'one push option works for a single branch' '
test_commit one &&
git push --mirror up &&
@@ t/t5548-push-porcelain.sh: run_git_push_porcelain_output_test() {
test_cmp expect actual
## t/t5550-http-fetch-dumb.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test dumb fetching over http via static file'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5550-http-fetch-dumb.sh: test_expect_success 'create http-accessible bare repository with loose objects'
hooks/post-update
) &&
@@ t/t5550-http-fetch-dumb.sh: test_expect_success 'set up evil alternates scheme'
# Here we'll just redirect via HTTP. In a real-world attack these would be on
## t/t5551-http-fetch-smart.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test smart fetching over http via http-backend'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5551-http-fetch-smart.sh: test_expect_success 'create http-accessible bare repository' '
git --bare init
) &&
@@ t/t5552-skipping-fetch-negotiator.sh: test_expect_success 'use ref advertisement
test_config -C client fetch.negotiationalgorithm skipping &&
## t/t5553-set-upstream.sh ##
+@@
+ #!/bin/sh
+
+ test_description='"git fetch/pull --set-upstream" basic tests.'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5553-set-upstream.sh: test_expect_success 'setup bare parent fetch' '
git remote add upstream parent
'
@@ t/t5553-set-upstream.sh: test_expect_success 'pull --set-upstream upstream tag d
check_config_missing other2
'
+ ## t/t5560-http-backend-noserver.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test git-http-backend-noserver'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
+
## t/t5561-http-backend.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test git-http-backend'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5561-http-backend.sh: POST() {
grep '^[^#]' >exp <<EOF
@@ t/t556x_common: get_static_files() {
get_static_files "200 OK"
## t/t5570-git-daemon.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test fetching over git protocol'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5570-git-daemon.sh: test_expect_success 'create git-accessible bare repository' '
: >git-daemon-export-ok
) &&
@@ t/t5570-git-daemon.sh: test_expect_success FAKENC 'hostname interpolation works
## t/t5571-pre-push-hook.sh ##
+@@
+ #!/bin/sh
+
+ test_description='check pre-push hooks'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5571-pre-push-hook.sh: EOF
cat >expected <<EOF
parent1
@@ t/t5572-pull-submodule.sh: test_expect_success 'branch has no merge base with re
git -C child reset --hard "$OTHER" &&
## t/t5580-unc-paths.sh ##
+@@
+ #!/bin/sh
+
+ test_description='various Windows-only path tests'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5580-unc-paths.sh: test_expect_success fetch '
git init to-fetch &&
(
@@ t/t5580-unc-paths.sh: test_expect_success fetch '
## t/t5581-http-curl-verbose.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test GIT_CURL_VERBOSE'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5581-http-curl-verbose.sh: test_expect_success 'setup repository' '
git add file &&
git commit -m one &&
@@ t/t5581-http-curl-verbose.sh: test_expect_success 'setup repository' '
test_expect_success 'failure in git-upload-pack is shown' '
## t/t5582-fetch-negative-refspec.sh ##
+@@ t/t5582-fetch-negative-refspec.sh: test_description='"git fetch" with negative refspecs.
+
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5582-fetch-negative-refspec.sh: test_expect_success "clone and setup child repos" '
git switch -c alternate &&
echo >file updated again by one &&
@@ t/t5582-fetch-negative-refspec.sh: test_expect_success "fetch with negative patt
cut -f -1 .git/FETCH_HEAD >actual &&
test_cmp expect actual
)
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TEST_NUMBER" in
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-4]*|5[0-4]*|55[0-3]*)
-+[0-4]*|5[0-5]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
16: dda6ce098c ! 17: b2fda75261 t5[6-9]*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t5601-clone.sh ##
+@@
+
+ test_description=clone
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5601-clone.sh: test_expect_success 'clone respects global branch.autosetuprebase' '
rm -fr dst &&
git clone src dst &&
@@ t/t5601-clone.sh: test_expect_success 'clone from a repository with two identica
test "z$( cd target-11 && git symbolic-ref HEAD )" = zrefs/heads/another
## t/t5604-clone-reference.sh ##
+@@
+ #
+
+ test_description='test clone --reference'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5604-clone-reference.sh: test_expect_success 'existence of info/alternates' '
'
@@ t/t5604-clone-reference.sh: test_expect_success 'fetch with incomplete alternate
'
## t/t5605-clone-local.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test local clone'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5605-clone-local.sh: test_expect_success 'preparing origin repository' '
test "$(cd a.git && git config --bool core.bare)" = true &&
test "$(cd x && git config --bool core.bare)" = true &&
@@ t/t5605-clone-local.sh: test_expect_success 'clone empty repository' '
## t/t5606-clone-options.sh ##
+@@
+ #!/bin/sh
+
+ test_description='basic clone options'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5606-clone-options.sh: test_expect_success 'setup' '
test_expect_success 'clone -o' '
@@ t/t5606-clone-options.sh: test_expect_success 'prefers config "clone.defaultRemo
## t/t5607-clone-bundle.sh ##
+@@
+ #!/bin/sh
+
+ test_description='some bundle related tests'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5607-clone-bundle.sh: test_expect_success 'setup' '
'
@@ t/t5608-clone-2gb.sh: test_expect_success 'setup' '
echo "data 5" &&
## t/t5609-clone-branch.sh ##
+@@
+ #!/bin/sh
+
+ test_description='clone --branch option'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5609-clone-branch.sh: test_expect_success 'setup' '
echo one >file && git add file && git commit -m one &&
git checkout -b two &&
@@ t/t5609-clone-branch.sh: test_expect_success 'clone -b sets up tracking' '
)
## t/t5610-clone-detached.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test cloning a repository with detached HEAD'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5610-clone-detached.sh: test_expect_success 'setup' '
'
@@ t/t5610-clone-detached.sh: test_expect_success 'cloned HEAD is detached' '
git clone "file://$PWD" detached-orphan
## t/t5611-clone-config.sh ##
+@@
+ #!/bin/sh
+
+ test_description='tests for git clone -c key=value'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5611-clone-config.sh: test_expect_success 'clone -c config is available during clone' '
test_expect_success 'clone -c remote.origin.fetch=<refspec> works' '
@@ t/t5611-clone-config.sh: test_expect_success 'clone -c remote.<remote>.fetch=<re
'
## t/t5612-clone-refspec.sh ##
-@@ t/t5612-clone-refspec.sh: test_description='test refspec written by clone-command'
+@@
+ #!/bin/sh
+
+ test_description='test refspec written by clone-command'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ t/t5614-clone-submodules-shallow.sh: test_description='Test shallow cloning of r
mkdir sub &&
## t/t5616-partial-clone.sh ##
+@@
+
+ test_description='git partial clone'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5616-partial-clone.sh: test_expect_success 'verify that .promisor file contains refs fetched' '
test_line_count = 1 promisorlist &&
git -C srv.bare rev-parse --verify HEAD >headhash &&
@@ t/t5616-partial-clone.sh: test_expect_success 'fetch lazy-fetches only to resolv
grep "fetch< version 2" trace &&
## t/t5617-clone-submodules-remote.sh ##
-@@ t/t5617-clone-submodules-remote.sh: test_description='Test cloning repos with submodules using remote-tracking branc
+@@
+
+ test_description='Test cloning repos with submodules using remote-tracking branches'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
+@@ t/t5617-clone-submodules-remote.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
pwd=$(pwd)
test_expect_success 'setup' '
@@ t/t5617-clone-submodules-remote.sh: test_expect_success 'clone with --single-bra
'
## t/t5700-protocol-v1.sh ##
+@@ t/t5700-protocol-v1.sh: TEST_NO_CREATE_REPO=1
+ GIT_TEST_PROTOCOL_VERSION=0
+ export GIT_TEST_PROTOCOL_VERSION
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5700-protocol-v1.sh: test_expect_success 'fetch with git:// using protocol v1' '
GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
fetch 2>log &&
@@ t/t5700-protocol-v1.sh: test_expect_success 'push with http:// using protocol v1
## t/t5701-git-serve.sh ##
+@@
+
+ test_description='test protocol v2 server commands'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5701-git-serve.sh: test_expect_success 'wrong object-format' '
#
test_expect_success 'setup some refs and tags' '
@@ t/t5701-git-serve.sh: test_expect_success 'symrefs parameter' '
## t/t5702-protocol-v2.sh ##
+@@ t/t5702-protocol-v2.sh: test_description='test git wire-protocol version 2'
+
+ TEST_NO_CREATE_REPO=1
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5702-protocol-v2.sh: test_expect_success 'ref advertisement is filtered with ls-remote using protocol
test_when_finished "rm -f log" &&
@@ t/t5702-protocol-v2.sh: test_expect_success 'push with http:// and a config of v
## t/t5703-upload-pack-ref-in-want.sh ##
+@@
+
+ test_description='upload-pack ref-in-want'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5703-upload-pack-ref-in-want.sh: write_command () {
# c(o/foo) d(o/bar)
@@ t/t5703-upload-pack-ref-in-want.sh: test_expect_success 'server is initially beh
## t/t5801-remote-helpers.sh ##
+@@
+
+ test_description='Test remote-helper import and export commands'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t5801-remote-helpers.sh: test_expect_success 'fetch multiple branches' '
(cd local &&
git fetch
@@ t/t5801-remote-helpers.sh: test_expect_success 'fetch HEAD' '
echo more >>file &&
git commit -a -m more
) &&
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TEST_NUMBER" in
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-4]*|5[0-5]*)
-+[0-5]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
17: 27d7994933 ! 18: dfbc93923b t6[0-3]*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t6000-rev-list-misc.sh ##
+@@
+
+ test_description='miscellaneous rev-list tests'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6000-rev-list-misc.sh: test_expect_success 'propagate uninteresting flag down correctly' '
'
@@ t/t6000-rev-list-misc.sh: test_expect_success 'propagate uninteresting flag down
< that
## t/t6001-rev-list-graft.sh ##
+@@
+
+ test_description='Revision traversal vs grafts and path limiter'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6001-rev-list-graft.sh: test_expect_success setup '
git commit -a -m "Third in one history." &&
A2=$(git rev-parse --verify HEAD) &&
@@ t/t6004-rev-list-path-optim.sh: test_description='git rev-list trivial path opti
/ /
o---------o----o----o----o side
a0 c0 c1 a1 c2
+@@ t/t6004-rev-list-path-optim.sh: test_description='git rev-list trivial path optimization test
+
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6004-rev-list-path-optim.sh: test_expect_success 'further setup' '
git add c &&
test_tick &&
@@ t/t6004-rev-list-path-optim.sh: test_expect_success 'path optimization 2' '
'
## t/t6006-rev-list-format.sh ##
+@@
+
+ test_description='git rev-list --pretty=format test'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6006-rev-list-format.sh: test_expect_success 'setup' '
test_format () {
cat >expect.$1
@@ t/t6006-rev-list-format.sh: test_expect_success '"%h %gD: %gs" is same as git-re
## t/t6007-rev-list-cherry-pick-file.sh ##
+@@
+
+ test_description='test git rev-list --cherry-pick -- file'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6007-rev-list-cherry-pick-file.sh: test_expect_success setup '
test_tick &&
git commit -m "E" &&
@@ t/t6007-rev-list-cherry-pick-file.sh: test_expect_success '--cherry-pick with in
cat >expect <<EOF
## t/t6008-rev-list-submodule.sh ##
+@@
+
+ test_description='git rev-list involving submodules that this repo has'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6008-rev-list-submodule.sh: test_expect_success 'setup' '
'
@@ t/t6008-rev-list-submodule.sh: test_expect_success 'setup' '
test_done
## t/t6009-rev-list-parent.sh ##
+@@
+
+ test_description='ancestor culling and limiting by parent number'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6009-rev-list-parent.sh: test_expect_success 'setup roots, merges and octopuses' '
test_commit seven &&
git checkout -b yetanotherbranch four &&
@@ t/t6009-rev-list-parent.sh: test_expect_success 'dodecapus' '
git tag dodecapus &&
## t/t6012-rev-list-simplify.sh ##
+@@
+
+ test_description='merge simplification'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6012-rev-list-simplify.sh: test_expect_success setup '
git add side &&
test_tick && git commit -m "Side root" &&
@@ t/t6012-rev-list-simplify.sh: test_expect_success setup '
## t/t6013-rev-list-reverse-parents.sh ##
+@@
+
+ test_description='--reverse combines with --parents'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6013-rev-list-reverse-parents.sh: test_expect_success 'set up --reverse example' '
commit two &&
git checkout -b side HEAD^ &&
@@ t/t6013-rev-list-reverse-parents.sh: test_expect_success 'set up --reverse examp
## t/t6016-rev-list-graph-simplify-history.sh ##
+@@
+
+ test_description='--graph and simplified history'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6016-rev-list-graph-simplify-history.sh: test_expect_success 'set up rev-list --graph test' '
test_commit A1 foo.txt &&
test_commit A2 bar.txt &&
@@ t/t6016-rev-list-graph-simplify-history.sh: test_expect_success 'set up rev-list
git checkout -b B A1 &&
## t/t6017-rev-list-stdin.sh ##
+@@
+
+ test_description='log family learns --stdin'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6017-rev-list-stdin.sh: test_expect_success setup '
done &&
for i in $them
@@ t/t6017-rev-list-stdin.sh: test_expect_success 'not only --stdin' '
'
## t/t6018-rev-list-glob.sh ##
+@@
+
+ test_description='rev-list/rev-parse --glob'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6018-rev-list-glob.sh: compare () {
test_expect_success 'setup' '
@@ t/t6018-rev-list-glob.sh: test_expect_success 'shortlog accepts --glob/--tags/--
## t/t6019-rev-list-ancestry-path.sh ##
+@@ t/t6019-rev-list-ancestry-path.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6019-rev-list-ancestry-path.sh: test_expect_success 'setup criss-cross' '
(cd criss-cross &&
git init &&
@@ t/t6019-rev-list-ancestry-path.sh: test_expect_success 'setup criss-cross' '
# no commits in bc descend from cb
## t/t6030-bisect-porcelain.sh ##
+@@ t/t6030-bisect-porcelain.sh: test_description='Tests git bisect functionality'
+
+ exec </dev/null
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6030-bisect-porcelain.sh: test_expect_success 'bisect start without -- takes unknown arg as pathspec' '
grep bar ".git/BISECT_NAMES"
'
@@ t/t6030-bisect-porcelain.sh: test_expect_success 'bisect: --no-checkout - target
git rev-list --objects BISECT_HEAD --not \$GOOD >tmp.\$\$ &&
## t/t6040-tracking-info.sh ##
+@@
+
+ test_description='remote tracking stats'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6040-tracking-info.sh: test_expect_success setup '
git branch -d brokenbase &&
git checkout -b b6 origin
@@ t/t6040-tracking-info.sh: test_expect_success '--set-upstream-to @{-1}' '
'
## t/t6050-replace.sh ##
+@@
+ #
+ test_description='Tests replace refs functionality'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6050-replace.sh: test_expect_success 'tag replaced commit' '
'
@@ t/t6050-replace.sh: test_expect_success GPG 'set up a merge commit with a merget
git cat-file commit $HASH10 | grep "^mergetag object"
## t/t6101-rev-parse-parents.sh ##
+@@
+
+ test_description='Test git rev-parse with different parent options'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6101-rev-parse-parents.sh: test_expect_success 'setup' '
test_commit second &&
git checkout --orphan tmp &&
@@ t/t6101-rev-parse-parents.sh: test_expect_success 'setup' '
## t/t6110-rev-list-sparse.sh ##
+@@
+ #!/bin/sh
+
+ test_description='operations that cull histories in unusual ways'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6110-rev-list-sparse.sh: test_expect_success setup '
git checkout -b side HEAD^ &&
test_commit D &&
@@ t/t6110-rev-list-sparse.sh: test_expect_success setup '
test_expect_success 'rev-list --first-parent --boundary' '
## t/t6111-rev-list-treesame.sh ##
+@@
+
+ test_description='TREESAME and limiting'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6111-rev-list-treesame.sh: test_expect_success setup '
git checkout other-branch &&
test_commit "Added other" other "Hello" C &&
@@ t/t6111-rev-list-treesame.sh: test_expect_success setup '
## t/t6112-rev-list-filters-objects.sh ##
+@@
+
+ test_description='git rev-list using object filtering'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6112-rev-list-filters-objects.sh: test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
sort >expected &&
@@ t/t6112-rev-list-filters-objects.sh: test_expect_success 'combine:... with more
## t/t6120-describe.sh ##
+@@ t/t6120-describe.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6120-describe.sh: check_describe c-* --tags HEAD^^2
check_describe B --tags HEAD^^2^
check_describe e --tags HEAD^^^
@@ t/t6120-describe.sh: test_expect_success 'describe commits with disjoint bases 2
)
## t/t6200-fmt-merge-msg.sh ##
+@@
+
+ test_description='fmt-merge-msg test'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6200-fmt-merge-msg.sh: test_expect_success GPG 'set up a signed tag' '
test_expect_success 'message for merging local branch' '
echo "Merge branch ${apos}left${apos}" >expected &&
@@ t/t6200-fmt-merge-msg.sh: test_expect_success 'merge-msg with "merging" an annot
test_done
## t/t6302-for-each-ref-filter.sh ##
+@@
+
+ test_description='test for-each-refs usage of ref-filter APIs'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6302-for-each-ref-filter.sh: test_expect_success 'setup some history and refs' '
git tag $sign -m "A signed tag" signed-tag &&
git tag $sign -m "Signed doubly" doubly-signed-tag signed-tag &&
@@ t/t6302-for-each-ref-filter.sh: test_expect_success '--merged is compatible with
git for-each-ref --format="%(refname:short): %(if)%(worktreepath)%(then)%(worktreepath)%(else)not checked out%(end)" refs/heads/ >actual &&
rm -r worktree_dir &&
git worktree prune &&
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- esac
-
- case "$TEST_NUMBER" in
--3404|4013|5310|5526)
-+3404|4013|5310|5526|6300)
- # Avoid conflicts with patch series that are cooking at the same time
- # as the patch series changing the default of `init.defaultBranch`.
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-5]*)
-+[0-5]*|6[0-3]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
18: 04878e2268 = 19: 0a4bc77dac t64*: preemptively adjust alignment to prepare for `master` -> `main`
19: f0fa12b577 ! 20: 3dbc83c6a1 t6[4-9]*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t6400-merge-df.sh ##
+@@
+ #
+
+ test_description='Test merge with directory/file conflicts'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6400-merge-df.sh: test_expect_success 'prepare repository' '
'
@@ t/t6400-merge-df.sh: test_expect_success 'F/D conflict' '
test_expect_success 'setup modify/delete + directory/file conflict' '
## t/t6402-merge-rename.sh ##
+@@
+ #!/bin/sh
+
+ test_description='Merge-recursive merging renames'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6402-merge-rename.sh: test_expect_success 'setup' '
git branch change &&
git branch change+rename &&
@@ t/t6402-merge-rename.sh: test_expect_success 'setup spurious "refusing to lose u
'
## t/t6404-recursive-merge.sh ##
+@@
+ #!/bin/sh
+
+ test_description='Test merge without common ancestors'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6404-recursive-merge.sh: test_expect_success 'setup tests' '
git add a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
@@ t/t6404-recursive-merge.sh: test_expect_success 'setup tests' '
## t/t6405-merge-symlinks.sh ##
+@@ t/t6405-merge-symlinks.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6405-merge-symlinks.sh: test_expect_success 'setup' '
git branch b-file &&
l=$(printf file | git hash-object -t blob -w --stdin) &&
@@ t/t6405-merge-symlinks.sh: test_expect_success 'setup' '
## t/t6406-merge-attr.sh ##
+@@
+
+ test_description='per path merge controlled by merge attribute'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6406-merge-attr.sh: test_expect_success setup '
git branch side &&
for f in text binary union
@@ t/t6406-merge-attr.sh: test_expect_success 'custom merge does not lock index' '
test_done
## t/t6407-merge-binary.sh ##
+@@
+
+ test_description='ask merge-recursive to merge binary files'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6407-merge-binary.sh: test_expect_success setup '
git ls-files -s a >E0 &&
git ls-files -s m | sed -e "s/ 0 / 3 /" >E3 &&
@@ t/t6407-merge-binary.sh: test_expect_success recursive '
false
## t/t6409-merge-subtree.sh ##
+@@
+
+ test_description='subtree merge strategy'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6409-merge-subtree.sh: test_expect_success setup '
echo >>hello world &&
git add hello &&
@@ t/t6409-merge-subtree.sh: test_expect_success 'merge update' '
git ls-files -s >actual &&
## t/t6411-merge-filemode.sh ##
+@@
+ #!/bin/sh
+
+ test_description='merge: handle file mode'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6411-merge-filemode.sh: test_expect_success 'set up mode change in one branch' '
: >file1 &&
git add file1 &&
@@ t/t6411-merge-filemode.sh: do_both_modes resolve
'
## t/t6412-merge-large-rename.sh ##
+@@
+ #!/bin/sh
+
+ test_description='merging with large rename matrix'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6412-merge-large-rename.sh: test_rename() {
test_expect_success "rename ($1, $2)" '
n='$1' &&
@@ t/t6412-merge-large-rename.sh: test_rename() {
}
## t/t6413-merge-crlf.sh ##
+@@ t/t6413-merge-crlf.sh: test_description='merge conflict in crlf repo
+
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6413-merge-crlf.sh: test_expect_success setup '
echo line from b | append_cr >file &&
git commit -m "add line from b" file &&
@@ t/t6413-merge-crlf.sh: test_expect_success setup '
test_expect_success 'Check "ours" is CRLF' '
## t/t6414-merge-rename-nocruft.sh ##
+@@
+ #!/bin/sh
+
+ test_description='Merge-recursive merging renames'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6414-merge-rename-nocruft.sh: test_expect_success 'setup' '
git update-index A &&
git commit -m "blue modify A" &&
@@ t/t6414-merge-rename-nocruft.sh: test_expect_success 'setup' '
# This test broke in 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae
## t/t6415-merge-dir-to-symlink.sh ##
+@@
+ #!/bin/sh
+
+ test_description='merging when a directory was replaced with a symlink'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6415-merge-dir-to-symlink.sh: test_expect_success 'create a commit where dir a/b changed to symlink' '
test_expect_success 'checkout does not clobber untracked symlink' '
@@ t/t6415-merge-dir-to-symlink.sh: test_expect_success 'do not lose modifications
test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
## t/t6416-recursive-corner-cases.sh ##
+@@
+
+ test_description='recursive merge corner cases involving criss-cross merges'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6416-recursive-corner-cases.sh: test_expect_success 'git detects conflict merging criss-cross+modify/delete' '
test_line_count = 2 out &&
@@ t/t6416-recursive-corner-cases.sh: test_expect_success 'check virtual merge base
base \
## t/t6417-merge-ours-theirs.sh ##
+@@
+ #!/bin/sh
+
+ test_description='Merge-recursive ours and theirs variants'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6417-merge-ours-theirs.sh: test_expect_success setup '
sed -e "s/9/nueve/" >file <elif &&
git commit -a -m theirs &&
@@ t/t6418-merge-text-auto.sh
*+ [side^] Initial
'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6418-merge-text-auto.sh: test_expect_success setup '
git commit -m "add line from b" &&
git tag b &&
@@ t/t6418-merge-text-auto.sh: test_expect_success 'Test delete/normalize conflict'
test_path_is_missing file
## t/t6419-merge-ignorecase.sh ##
+@@
+
+ test_description='git-merge with case-changing rename on case-insensitive file system'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6419-merge-ignorecase.sh: test_expect_success 'merge with case-changing rename' '
>foo &&
git add foo &&
@@ t/t6419-merge-ignorecase.sh: test_expect_success 'merge with case-changing renam
## t/t6422-merge-rename-corner-cases.sh ##
+@@
+ 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6422-merge-rename-corner-cases.sh: test_conflicts_with_adds_and_renames() {
# Setup:
# L
@@ t/t6422-merge-rename-corner-cases.sh: test_expect_success 'check nested conflict
test_must_fail git merge-file \
## t/t6425-merge-rename-delete.sh ##
+@@
+ #!/bin/sh
+
+ test_description='Merge-recursive rename/delete conflict message'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6425-merge-rename-delete.sh: test_expect_success 'rename/delete' '
git mv A B &&
git commit -m "rename" &&
@@ t/t6425-merge-rename-delete.sh: test_expect_success 'rename/delete' '
## t/t6427-diff3-conflict-markers.sh ##
+@@
+
+ test_description='recursive merge diff3 style conflict markers'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6427-diff3-conflict-markers.sh: test_expect_success 'check no merge base' '
# Setup:
# L1
@@ t/t6427-diff3-conflict-markers.sh: test_expect_success 'rebase --apply describes
'
## t/t6430-merge-recursive.sh ##
+@@
+
+ test_description='merge-recursive backend test'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6430-merge-recursive.sh: test_expect_success 'setup 1' '
git add a d/e &&
@@ t/t6432-merge-recursive-space-options.sh
*+ [remote^] Initial revision
* ok 1: setup
'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6432-merge-recursive-space-options.sh: test_expect_success 'setup' '
mv text.txt+ text.txt &&
git commit -a -m "Remove cruft" &&
@@ t/t6432-merge-recursive-space-options.sh: test_expect_success 'setup' '
s/Quite correct\(.*\)/It is too correct\1Q/
## t/t6433-merge-toplevel.sh ##
-@@ t/t6433-merge-toplevel.sh: test_description='"git merge" top-level frontend'
+@@
+
+ test_description='"git merge" top-level frontend'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
t3033_reset () {
@@ t/t6434-merge-recursive-rename-options.sh: test_description='merge-recursive ren
D 0-old
D 1-old
D 2-old
+@@ t/t6434-merge-recursive-rename-options.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6434-merge-recursive-rename-options.sh: test_expect_success 'setup repo' '
get_expected_stages 2 &&
get_expected_stages 3 &&
@@ t/t6434-merge-recursive-rename-options.sh: test_expect_success 'setup repo' '
test_expect_success 'setup thresholds' '
## t/t6436-merge-overwrite.sh ##
+@@ t/t6436-merge-overwrite.sh: test_description='git-merge
+
+ Do not overwrite changes.'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6436-merge-overwrite.sh: test_expect_success 'set up unborn branch and content' '
'
@@ t/t6436-merge-overwrite.sh: test_expect_success 'set up unborn branch and conten
grep foo expect &&
## t/t6437-submodule-merge.sh ##
+@@
+
+ test_description='merging with submodules'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6437-submodule-merge.sh: test_expect_success setup '
test_tick &&
git commit -m root &&
@@ t/t6437-submodule-merge.sh: test_expect_success 'setup for recursive merge with
git commit -m c &&
## t/t6439-merge-co-error-msgs.sh ##
+@@
+
+ test_description='unpack-trees error messages'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6439-merge-co-error-msgs.sh: test_expect_success 'setup' '
git add two three four five &&
git commit -m Second &&
@@ t/t6439-merge-co-error-msgs.sh: test_expect_success 'not_uptodate_dir porcelain
test_must_fail git checkout branch 2>out &&
## t/t6501-freshen-objects.sh ##
+@@
+ # to refer to an existing tree).
+
+ test_description='check pruning of dependent objects'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t6501-freshen-objects.sh: for repack in '' true; do
git checkout -b experiment &&
commit abandon &&
@@ t/t6501-freshen-objects.sh: for repack in '' true; do
git branch -D experiment
'
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TEST_NUMBER" in
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-5]*|6[0-3]*)
-+[0-6]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
20: f9c30dc516 ! 21: 2315a253f6 t7[0-4]*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t7003-filter-branch.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git filter-branch'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7003-filter-branch.sh: test_expect_success 'setup' '
mkdir dir &&
test_commit dir/D &&
@@ t/t7003-filter-branch.sh: test_expect_success 'automatic remapping to ancestor w
## t/t7004-tag.sh ##
+@@ t/t7004-tag.sh: test_description='git tag
+
+ Tests for operations with tags.'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7004-tag.sh: test_expect_success 'checking that branch head with --no-contains lists all but
"
@@ t/t7004-tag.sh: test_expect_success ULIMIT_STACK_SIZE '--contains and --no-conta
test_must_be_empty actual &&
## t/t7030-verify-tag.sh ##
+@@
+ #!/bin/sh
+
+ test_description='signed tag tests'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7030-verify-tag.sh: test_expect_success GPG 'create signed tags' '
echo 3 >elif && git add elif &&
test_tick && git commit -m "third on side" &&
@@ t/t7030-verify-tag.sh: test_expect_success GPG 'create signed tags' '
## t/t7060-wtstatus.sh ##
+@@
+
+ test_description='basic work tree status reporting'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7060-wtstatus.sh: EOF
git checkout -b side HEAD^ &&
git rm foo &&
@@ t/t7060-wtstatus.sh: test_expect_success 'status --branch with detached HEAD' '
## HEAD (no branch)
## t/t7063-status-untracked-cache.sh ##
+@@
+
+ test_description='test untracked cache'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7063-status-untracked-cache.sh: EOF
test_expect_success 'set up sparse checkout' '
echo "done/[a-z]*" >.git/info/sparse-checkout &&
@@ t/t7063-status-untracked-cache.sh: test_expect_success '"status" after file repl
status_is_clean
## t/t7102-reset.sh ##
+@@ t/t7102-reset.sh: test_description='git reset
+
+ Documented tests for git reset'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7102-reset.sh: test_expect_success 'trying to do reset --soft with pending merge should fail' '
printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
git commit -a -m "the change in branch2" &&
@@ t/t7102-reset.sh: test_expect_success '--hard reset to ORIG_HEAD should clear a
'
## t/t7113-post-index-change-hook.sh ##
+@@
+
+ test_description='post index change hook'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7113-post-index-change-hook.sh: test_expect_success 'test checkout and reset trigger the hook' '
EOF
: force index to be dirty &&
@@ t/t7201-co.sh: Test switching across them.
'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7201-co.sh: test_expect_success setup '
fill a b c d e f >two &&
git commit -a -m "Renamer R one->uno, M two" &&
@@ t/t7201-co.sh: test_expect_success 'checkout --conflict=diff3' '
! grep "^Previous HEAD" error.log
## t/t7400-submodule-basic.sh ##
+@@ t/t7400-submodule-basic.sh: This test tries to verify basic sanity of the init, update and status
+ subcommands of git submodule.
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7400-submodule-basic.sh: inspect() {
}
@@ t/t7400-submodule-basic.sh: test_expect_success 'apply submodule diff' '
## t/t7403-submodule-sync.sh ##
+@@ t/t7403-submodule-sync.sh: test_description='git submodule sync
+ These tests exercise the "git submodule sync" subcommand.
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7403-submodule-sync.sh: test_expect_success 'change submodule url' '
(
cd super &&
@@ t/t7403-submodule-sync.sh: test_expect_success '"git submodule sync --recursive"
'
## t/t7406-submodule-update.sh ##
-@@ t/t7406-submodule-update.sh: submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
+@@ t/t7406-submodule-update.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
+@@ t/t7406-submodule-update.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
compare_head()
{
@@ t/t7406-submodule-update.sh: test_expect_success 'submodule update places git-di
)
## t/t7407-submodule-foreach.sh ##
+@@ t/t7407-submodule-foreach.sh: This test verifies that "git submodule foreach" correctly visits all submodules
+ that are currently checked out.
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7407-submodule-foreach.sh: sub1sha1_short=$(cd clone3/sub1 && git rev-parse --short HEAD)
sub2sha1_short=$(cd clone3/sub2 && git rev-parse --short HEAD)
@@ t/t7407-submodule-foreach.sh: test_expect_success 'ensure "status --cached --rec
test_expect_success 'test "status --recursive" from sub directory' '
## t/t7409-submodule-detached-work-tree.sh ##
+@@ t/t7409-submodule-detached-work-tree.sh: on detached working trees
+ '
+
+ TEST_NO_CREATE_REPO=1
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7409-submodule-detached-work-tree.sh: test_expect_success 'submodule on detached working tree' '
git rev-parse --verify HEAD >actual &&
test_cmp ../../../../expect actual
@@ t/t7409-submodule-detached-work-tree.sh: test_expect_success 'submodule on detac
cd home &&
## t/t7417-submodule-path-url.sh ##
+@@
+ #!/bin/sh
+
+ test_description='check handling of .gitmodule path with dash'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7417-submodule-path-url.sh: test_expect_success MINGW 'submodule paths disallows trailing spaces' '
sed "s/sub/sub /" <tree >tree.new &&
tree=$(git -C super mktree <tree.new) &&
@@ t/t7417-submodule-path-url.sh: test_expect_success MINGW 'submodule paths disall
test_must_fail git clone --recurse-submodules super dst 2>err &&
test_i18ngrep "sub " err
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- esac
-
- case "$TEST_NUMBER" in
--3404|4013|5310|5526|6300)
-+3404|4013|5310|5526|6300|7064)
- # Avoid conflicts with patch series that are cooking at the same time
- # as the patch series changing the default of `init.defaultBranch`.
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-6]*)
-+[0-6]*|7[0-4]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
21: 2b269ca983 ! 22: 20eef6cc97 t7[5-9]*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t7501-commit-basic-functionality.sh ##
+@@
+ # signoff
+
+ test_description='git commit'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7501-commit-basic-functionality.sh: test_expect_success 'same tree (merge and amend merge)' '
echo zero >zero &&
git add zero &&
@@ t/t7501-commit-basic-functionality.sh: test_expect_success 'same tree (merge and
git diff HEAD^ HEAD >actual &&
## t/t7502-commit-porcelain.sh ##
+@@
+
+ test_description='git commit porcelain-ish'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7502-commit-porcelain.sh: test_expect_success 'output summary format for merges' '
output_tests_cleanup() {
@@ t/t7502-commit-porcelain.sh: git reset -q --hard
sed -n -e "s/^parent //p" -e "/^$/q" raw >actual &&
## t/t7503-pre-commit-and-pre-merge-commit-hooks.sh ##
+@@
+
+ test_description='pre-commit and pre-merge-commit hooks'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7503-pre-commit-and-pre-merge-commit-hooks.sh: test_expect_success 'root commit' '
git add foo &&
git commit -m "make it non-ff" &&
@@ t/t7503-pre-commit-and-pre-merge-commit-hooks.sh: test_expect_success POSIXPERM
## t/t7504-commit-msg-hook.sh ##
+@@
+
+ test_description='commit-msg hook'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7504-commit-msg-hook.sh: test_expect_success '--no-verify with failing hook (editor)' '
test_expect_success 'merge fails with failing hook' '
@@ t/t7504-commit-msg-hook.sh: test_expect_success "hook doesn't edit commit messag
git add file2 &&
## t/t7505-prepare-commit-msg-hook.sh ##
+@@
+
+ test_description='prepare-commit-msg hook'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7505-prepare-commit-msg-hook.sh: test_expect_success 'set up commits for rebasing' '
do
test_commit rebase-$i c $i
@@ t/t7508-status.sh: test_expect_success 'git commit --dry-run will show a staged
(use "git pull" to merge the remote branch into yours)
## t/t7510-signed-commit.sh ##
+@@
+ #!/bin/sh
+
+ test_description='signed commit tests'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7510-signed-commit.sh: test_expect_success GPG 'create signed commits' '
echo 3 >elif && git add elif &&
test_tick && git commit -m "third on side" &&
@@ t/t7510-signed-commit.sh: test_expect_success GPG 'create signed commits' '
## t/t7512-status-help.sh ##
+@@
+
+ test_description='git status advice'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7512-status-help.sh: test_expect_success 'prepare for conflicts' '
git config --global advice.statusuoption false &&
test_commit init main.txt init &&
@@ t/t7512-status-help.sh: EOF
test_commit two_commit main.txt two &&
## t/t7517-per-repo-email.sh ##
+@@
+
+ test_description='per-repo forced setting of email address'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7517-per-repo-email.sh: test_expect_success 'set up rebase scenarios' '
test_expect_success 'fast-forward rebase does not care about ident' '
@@ t/t7600-merge.sh: Testing basic merge operations/option parsing.
+ * [c1] commit 1
+ [c6] c6
+ [c5] c5
+@@ t/t7600-merge.sh: Testing basic merge operations/option parsing.
+ +++++++* [c0] commit 0
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7600-merge.sh: test_expect_success 'merge c0 with c1 with --ff-only' '
test_debug 'git log --graph --decorate --oneline --all'
@@ t/t7606-merge-custom.sh: test_description="git merge
* | (tag: c1) c1
## t/t7608-merge-messages.sh ##
+@@
+ #!/bin/sh
+
+ test_description='test auto-generated merge messages'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7608-merge-messages.sh: check_oneline() {
}
@@ t/t7608-merge-messages.sh: check_oneline() {
test_done
## t/t7610-mergetool.sh ##
-@@ t/t7610-mergetool.sh: Testing basic merge tool invocation'
+@@ t/t7610-mergetool.sh: test_description='git mergetool
+
+ Testing basic merge tool invocation'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# All the mergetool test work by checking out a temporary branch based
@@ t/t7611-merge-abort.sh: Set up repo with conflicting and non-conflicting branche
# \
# --- foo/barf/bazf <-- conflict_branch
# \
+@@ t/t7611-merge-abort.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7611-merge-abort.sh: test_expect_success 'setup' '
git checkout -b clean_branch HEAD^ &&
echo bart > bar &&
@@ t/t7611-merge-abort.sh: test_expect_success 'setup' '
pre_merge_head="$(git rev-parse HEAD)"
## t/t7612-merge-verify-signatures.sh ##
+@@
+ #!/bin/sh
+
+ test_description='merge signature verification tests'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7612-merge-verify-signatures.sh: test_expect_success GPG 'create signed commits' '
echo 3 >baz && git add baz &&
test_tick && git commit -SB7227189 -m "untrusted on side" &&
@@ t/t7612-merge-verify-signatures.sh: test_expect_success GPG 'create signed commi
test_expect_success GPG 'merge unsigned commit with verification' '
## t/t7614-merge-signoff.sh ##
-@@ t/t7614-merge-signoff.sh: This test runs git merge --signoff and makes sure that it works.
+@@ t/t7614-merge-signoff.sh: test_description='git merge --signoff
+ This test runs git merge --signoff and makes sure that it works.
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
+@@ t/t7614-merge-signoff.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
test_setup() {
# Expected commit message after merge --signoff
cat >expected-signed <<EOF &&
@@ t/t7614-merge-signoff.sh: test_expect_success 'setup' '
'
## t/t7701-repack-unpack-unreachable.sh ##
+@@
+
+ test_description='git repack works correctly'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7701-repack-unpack-unreachable.sh: test_expect_success '-A with -d option leaves unreachable objects unpacked' '
git commit -a -m more_content &&
csha1=$(git rev-parse HEAD^{commit}) &&
@@ t/t7701-repack-unpack-unreachable.sh: test_expect_success '-A with -d option lea
git commit -a -m even_more_content &&
## t/t7800-difftool.sh ##
+@@ t/t7800-difftool.sh: test_description='git-difftool
+ Testing basic diff tool invocation
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7800-difftool.sh: test_expect_success 'basic usage requires no repo' '
test_i18ngrep ^usage: output
'
@@ t/t7800-difftool.sh: run_dir_diff_test 'difftool --dir-diff with unmerged files'
cat >expect <<-EOF &&
## t/t7810-grep.sh ##
+@@
+ test_description='git grep various.
+ '
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t7810-grep.sh: test_expect_success 'grep -e -- -- path' '
'
@@ t/t7810-grep.sh: test_expect_success 'grep --no-index pattern -- path' '
test_cmp expect actual
'
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- esac
-
- case "$TEST_NUMBER" in
--3404|4013|5310|5526|6300|7064)
-+3404|4013|5310|5526|6300|7064|7817)
- # Avoid conflicts with patch series that are cooking at the same time
- # as the patch series changing the default of `init.defaultBranch`.
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-6]*|7[0-4]*)
-+[0-7]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;; 22: 5cac0065c8 ! 23: e37bc3c792 t8*: adjust the references to the default branch name "main"
@@ t/annotate-tests.sh: test_expect_success 'blame --first-parent blames merge for
test_expect_success 'setup evil merge' '
## t/t8001-annotate.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git annotate' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +
+ . ./test-lib.sh
@@ t/t8001-annotate.sh: PROG='git annotate'
. "$TEST_DIRECTORY"/annotate-tests.sh
@@ t/t8001-annotate.sh: PROG='git annotate'
test 2 = $(grep A <authors | wc -l) &&
test 2 = $(grep B <authors | wc -l)
+ ## t/t8002-blame.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git blame'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
+
## t/t8003-blame-corner-cases.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git blame corner cases' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t8003-blame-corner-cases.sh: test_expect_success 'blame wholesale copy and more in the index' '
test_expect_success 'blame during cherry-pick with file rename conflict' '
@@ t/t8003-blame-corner-cases.sh: test_expect_success 'blame wholesale copy and mor
git add rodent &&
## t/t8004-blame-with-conflicts.sh ##
+@@
+ # Based on a test case submitted by Björn Steinbrink.
+
+ test_description='git blame on conflicted files' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t8004-blame-with-conflicts.sh: test_expect_success 'setup first case' '
git add file2 &&
git commit --author "U Gly <ug@localhost>" -m ugly &&
@@ t/t8004-blame-with-conflicts.sh: Even more" > file2 &&
exit 1
else
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TEST_NUMBER" in
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-7]*)
-+[0-8]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
+ ## t/t8012-blame-colors.sh ##
+@@
+ #!/bin/sh
+
+ test_description='colored git blame' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
23: 57e90d459a ! 24: 3e81bc89a2 t9[0-4]*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by Johannes Schindelin <[email protected]>
## t/t9001-send-email.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git send-email'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t9001-send-email.sh: test_expect_success $PREREQ '--compose-encoding adds correct MIME for subject' '
'
@@ t/t9001-send-email.sh: test_expect_success $PREREQ 'test that send-email works o
test_expect_success $PREREQ 'test that sendmail config is rejected' '
## t/t9100-git-svn-basic.sh ##
+@@
+ test_description='git svn basic tests'
+ GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-svn.sh
@@ t/t9100-git-svn-basic.sh: test_expect_success 'dcommit $rev does not clobber current branch' '
test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
git log refs/remotes/bar | grep "change 1" &&
@@ t/t9145-git-svn-master-branch.sh
# Copyright (c) 2009 Eric Wong
#
-test_description='git svn initial master branch is "trunk" if possible'
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+test_description='git svn initial main branch is "trunk" if possible'
- . ./lib-git-svn.sh
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- test_expect_success 'setup test repository' '
+ . ./lib-git-svn.sh
@@ t/t9145-git-svn-master-branch.sh: test_expect_success 'setup test repository' '
svn_cmd import -m b/b i "$svnrepo/branches/b"
'
@@ t/t9145-git-svn-master-branch.sh: test_expect_success 'setup test repository' '
## t/t9151-svn-mergeinfo.sh ##
+@@
+
+ test_description='git-svn svn mergeinfo properties'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-svn.sh
@@ t/t9151-svn-mergeinfo.sh: test_expect_success 'merging two branches in one commit is detected correctly' '
'
@@ t/t9151-svn-mergeinfo.sh: test_expect_success 'merging two branches in one commi
## t/t9155-git-svn-fetch-deleted-tag.sh ##
+@@
+
+ test_description='git svn fetch deleted tag'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-svn.sh
@@ t/t9155-git-svn-fetch-deleted-tag.sh: test_expect_success 'fetch deleted tags from same revision with checksum error'
git svn fetch &&
@@ t/t9155-git-svn-fetch-deleted-tag.sh: test_expect_success 'fetch deleted tags fr
test_done
## t/t9156-git-svn-fetch-deleted-tag-2.sh ##
+@@
+
+ test_description='git svn fetch deleted tag 2'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-svn.sh
@@ t/t9156-git-svn-fetch-deleted-tag-2.sh: test_expect_success 'fetch deleted tags from same revision with no checksum erro
cd git_project &&
git svn fetch &&
@@ t/t9156-git-svn-fetch-deleted-tag-2.sh: test_expect_success 'fetch deleted tags
test_done
## t/t9163-git-svn-reset-clears-caches.sh ##
+@@
+ #
+
+ test_description='git svn reset clears memoized caches' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-svn.sh
@@ t/t9163-git-svn-reset-clears-caches.sh: test_expect_success 'fetch to merge-base (a)' '
test_expect_success 'rebase looses SVN merge (m)' '
git svn rebase &&
@@ t/t9163-git-svn-reset-clears-caches.sh: test_expect_success 'fetch to merge-base
# git svn fetch creates correct history with merge commit
## t/t9169-git-svn-dcommit-crlf.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git svn dcommit CRLF' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-svn.sh
@@ t/t9169-git-svn-dcommit-crlf.sh: test_expect_success 'setup commit repository' '
p=$(git rev-parse HEAD) &&
t=$(git write-tree) &&
@@ t/t9169-git-svn-dcommit-crlf.sh: test_expect_success 'setup commit repository' '
git svn dcommit &&
## t/t9300-fast-import.sh ##
+@@
+ #
+
+ test_description='test git fast-import utility' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t9300-fast-import.sh: test_expect_success 'A: create pack from stdin' '
mark :4
data $file4_len
@@ t/t9300-fast-import.sh: test_expect_success 'Y: rewrite submodules' '
## t/t9301-fast-import-notes.sh ##
-@@ t/t9301-fast-import-notes.sh: test_description='test git fast-import of notes objects' +@@
+ #
+
+ test_description='test git fast-import of notes objects' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
+@@ t/t9301-fast-import-notes.sh: export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
test_tick
cat >input <<INPUT_END
@@ t/t9302-fast-import-unpack-limit.sh: test_expect_success 'lookups after checkpoi
make sure from "unpacked sha1 reference" works, too
## t/t9350-fast-export.sh ##
+@@
+ #
+
+ test_description='git fast-export' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t9350-fast-export.sh: test_expect_success 'setup' '
git commit -m sitzt file2 &&
test_tick &&
@@ t/t9350-fast-export.sh: test_expect_success 'merge commit gets exported with --i
'
## t/t9351-fast-export-anonymize.sh ##
+@@
+ #!/bin/sh
+
+ test_description='basic tests for fast-export --anonymize' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t9351-fast-export-anonymize.sh: test_expect_success 'stream retains other as refname' '
'
@@ t/t9351-fast-export-anonymize.sh: test_expect_success 'repo has original shape a
'
## t/t9400-git-cvsserver-server.sh ##
+@@ t/t9400-git-cvsserver-server.sh: 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 ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t9400-git-cvsserver-server.sh: test_expect_success 'setup' '
touch secondrootfile &&
git add secondrootfile &&
@@ t/t9400-git-cvsserver-server.sh: test_expect_success 'cvs co -c (shows module da
xbranch:
## t/t9401-git-cvsserver-crlf.sh ##
+@@ t/t9401-git-cvsserver-crlf.sh: 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 ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t9401-git-cvsserver-crlf.sh: test_expect_success 'setup' '
'
@@ t/t9401-git-cvsserver-crlf.sh: test_expect_success 'update subdir of other copy
git add multilineTxt.c &&
## t/t9402-git-cvsserver-refs.sh ##
+@@ t/t9402-git-cvsserver-refs.sh: 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 ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./test-lib.sh
@@ t/t9402-git-cvsserver-refs.sh: test_expect_success 'setup v1, b1' '
rm -rf cvswork
@@ t/t9402-git-cvsserver-refs.sh: test_expect_success 'setup simple b2' '
check_start_tree cvswork &&
check_file cvswork textfile.c v1 &&
check_file cvswork t2 v1 &&
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TEST_NUMBER" in
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-8]*)
-+[0-8]*|9[0-4]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
24: f9e01de17f ! 25: cda06e253d t9[5-7]*: adjust the references to the default branch name "main"
@@ t/lib-cvs.sh: setup_cvs_test_repository () {
else
## t/t9500-gitweb-standalone-no-errors.sh ##
+@@ t/t9500-gitweb-standalone-no-errors.sh: commandline, and checks that it would not write any errors
+ or warnings to log.'
+
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./gitweb-lib.sh
@@ t/t9500-gitweb-standalone-no-errors.sh: test_expect_success \
echo "Branch" >>b &&
git add b &&
@@ t/t9500-gitweb-standalone-no-errors.sh: test_expect_success \
test_done
## t/t9501-gitweb-standalone-http-status.sh ##
+@@ t/t9501-gitweb-standalone-http-status.sh: commandline, and checks that it returns the expected HTTP status
+ code and message.'
+
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./gitweb-lib.sh
@@ t/t9501-gitweb-standalone-http-status.sh: test_debug 'cat gitweb.headers'
# snapshot hash ids
@@ t/t9501-gitweb-standalone-http-status.sh: test_expect_success DATE_PARSER 'modif
test_debug 'cat gitweb.headers'
## t/t9502-gitweb-standalone-parse-output.sh ##
+@@ t/t9502-gitweb-standalone-parse-output.sh: 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
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./gitweb-lib.sh
@@ t/t9502-gitweb-standalone-parse-output.sh: test_expect_success 'snapshot: HEAD' '
'
test_debug 'cat gitweb.headers && cat file_list'
@@ t/t9502-gitweb-standalone-parse-output.sh: test_expect_success 'snapshot: short
## t/t9600-cvsimport.sh ##
+@@
+ #!/bin/sh
+
+ test_description='git cvsimport basic tests' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-cvs.sh
@@ t/t9600-cvsimport.sh: test_expect_success PERL 'no .git/cvs-revisions created by default' '
'
@@ t/t9600-cvsimport.sh: test_expect_success PERL 'no .git/cvs-revisions created by
test_done
## t/t9601-cvsimport-vendor-branch.sh ##
+@@
+ # tag has been removed.
+
+ test_description='git cvsimport handling of vendor branches' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-cvs.sh
@@ t/t9601-cvsimport-vendor-branch.sh: test_expect_success PERL 'import a module with a vendor branch' '
'
@@ t/t9601-cvsimport-vendor-branch.sh: test_expect_success PERL 'import a module wi
## t/t9602-cvsimport-branches-tags.sh ##
+@@
+ # t9602/README.
+
+ test_description='git cvsimport handling of branches and tags' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-cvs.sh
@@ t/t9602-cvsimport-branches-tags.sh: test_expect_success PERL 'import module' '
'
@@ t/t9602-cvsimport-branches-tags.sh: test_expect_success PERL 'import module' '
## t/t9603-cvsimport-patchsets.sh ##
+@@
+ # bug.
+
+ test_description='git cvsimport testing for correct patchset estimation' +-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-cvs.sh
@@ t/t9603-cvsimport-patchsets.sh: test_expect_failure PERL 'import with criss cross times on revisions' '
git cvsimport -p"-x" -C module-git module &&
(
@@ t/t9603-cvsimport-patchsets.sh: test_expect_failure PERL 'import with criss cros
echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TEST_NUMBER" in
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-8]*|9[0-4]*)
-+[0-8]*|9[0-7]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
25: 4da4b69114 ! 26: fb8584d993 tests(git-p4): transition to the default branch name main
@@ Commit message
Signed-off-by: Johannes Schindelin <[email protected]>
## t/t9800-git-p4-basic.sh ##
+@@
+
+ test_description='git p4 tests'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-p4.sh
@@ t/t9800-git-p4-basic.sh: test_expect_success 'clone --bare should make a bare repository' '
git config --get --bool core.bare true &&
git rev-parse --verify refs/remotes/p4/master &&
@@ t/t9800-git-p4-basic.sh: test_expect_success 'clone --bare should make a bare re
'
## t/t9801-git-p4-branch.sh ##
+@@
+
+ test_description='git p4 tests for p4 branches'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-p4.sh
@@ t/t9801-git-p4-branch.sh: test_expect_success 'import main, no branch detection' '
(
cd "$git" &&
@@ t/t9801-git-p4-branch.sh: test_expect_success 'use-client-spec detect-branches s
test_path_is_missing b3-file3_1
## t/t9806-git-p4-options.sh ##
+@@
+
+ test_description='git p4 options'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-p4.sh
@@ t/t9806-git-p4-options.sh: test_expect_success 'clone no --git-dir' '
test_must_fail git p4 clone --git-dir=xx //depot
'
@@ t/t9806-git-p4-options.sh: test_expect_success 'clone --use-client-spec' '
)
## t/t9807-git-p4-submit.sh ##
+@@
+
+ test_description='git p4 submit'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-p4.sh
@@ t/t9807-git-p4-submit.sh: test_expect_success 'submit with allowSubmit' '
git config git-p4.skipSubmitEdit true &&
git config git-p4.allowSubmit "nobranch" &&
@@ t/t9807-git-p4-submit.sh: test_expect_success 'submit with allowSubmit' '
'
## t/t9811-git-p4-label-import.sh ##
+@@
+
+ test_description='git p4 label tests'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-git-p4.sh
@@ t/t9811-git-p4-label-import.sh: test_expect_success 'tag that cannot be exported' '
git add main/f12 &&
git commit -m "adding f12" &&
@@ t/t9811-git-p4-label-import.sh: test_expect_success 'tag that cannot be exported
git p4 submit --export-labels
) &&
(
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TEST_NUMBER" in
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-8]*|9[0-7]*)
-+[0-8]*|9[0-8]*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;; 26: cfa29c7f71 ! 27: bbc17c8ee5 t99*: adjust the references to the default branch name "main"
@@ Commit message
Signed-off-by Johannes Schindelin <[email protected]>
## t/t9903-bash-prompt.sh ##
+@@
+
+ test_description='test git-specific bash prompt functions'
+
+-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master ++GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+ . ./lib-bash.sh
@@ t/t9903-bash-prompt.sh: test_expect_success 'setup for prompt tests' '
echo 3 >file &&
git commit -m "third b1" file &&
@@ t/t9903-bash-prompt.sh: test_expect_success 'prompt - hide if pwd ignored - env
test_config bash.hideIfPwdIgnored false &&
(
cd ignored_dir &&
-
- ## t/test-lib.sh ##
-@@ t/test-lib.sh: case "$TRASH_DIRECTORY" in
- esac
-
- case "$TEST_NUMBER" in
--3404|4013|5310|5526|6300|7064|7817)
-+3404|4013|5310|5526|6300|7064|7817|9902)
- # Avoid conflicts with patch series that are cooking at the same time
- # as the patch series changing the default of init.defaultBranch.
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
--[0-8]*|9[0-8]*)
-+*)
- GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
- export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
- ;;
27: fc0c1f6463 = 28: ec9b9cab88 tests: drop prereq PREPARE_FOR_MAIN_BRANCH where no longer needed
Signature · 1 line
gitgitgadget
PATCH v3 1/28 tests: mark tests relying on the current default for `init.defaultBranch`
From: Johannes Schindelin <[email protected]>
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 <[email protected]>
--- 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(+)
ci/run-build-and-tests.sh +2 -0
@@ -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)
t/t0002-gitfile.sh +3 -0
@@ -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() {
t/t0020-crlf.sh +3 -0
@@ -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() {
t/t0021-conversion.sh +3 -0
@@ -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"
t/t0028-working-tree-encoding.sh +3 -0
@@ -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
t/t0041-usage.sh +3 -0
@@ -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 ' '
t/t0050-filesystem.sh +3 -0
@@ -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')
t/t0100-previous.sh +3 -0
@@ -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}' '
t/t1004-read-tree-m-u-wf.sh +3 -0
@@ -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
t/t1008-read-tree-overlay.sh +3 -0
@@ -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
t/t1009-read-tree-new-index.sh +3 -0
@@ -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 '
t/t1021-rerere-in-workdir.sh +3 -0
@@ -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 '
t/t1090-sparse-checkout-scope.sh +3 -0
@@ -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' '
t/t1091-sparse-checkout-builtin.sh +3 -0
@@ -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() {
t/t1300-config.sh +3 -0
@@ -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' '
t/t1301-shared-repo.sh +3 -0
@@ -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.
t/t1400-update-ref.sh +3 -0
@@ -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
t/t1403-show-ref.sh +3 -0
@@ -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 '
t/t1405-main-ref-store.sh +3 -0
@@ -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"
t/t1406-submodule-ref-store.sh +3 -0
@@ -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"
t/t1407-worktree-ref-store.sh +3 -0
@@ -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"
t/t1408-packed-refs.sh +3 -0
@@ -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 '
t/t1410-reflog.sh +3 -0
@@ -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 () {
t/t1411-reflog-show.sh +3 -0
@@ -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' '
t/t1413-reflog-detach.sh +3 -0
@@ -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 () {
t/t1414-reflog-walk.sh +3 -0
@@ -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' '
t/t1416-ref-transaction-hooks.sh +3 -0
@@ -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 '
t/t1430-bad-ref-name.sh +3 -0
@@ -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 '
t/t1500-rev-parse.sh +3 -0
@@ -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
t/t1503-rev-parse-verify.sh +3 -0
@@ -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()
t/t1505-rev-parse-last.sh +3 -0
@@ -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
t/t1506-rev-parse-diagnosis.sh +3 -0
@@ -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 ()
t/t1507-rev-parse-upstream.sh +3 -0
@@ -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
t/t1508-at-combinations.sh +3 -0
@@ -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() {
t/t1511-rev-parse-caret.sh +3 -0
@@ -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' '
t/t1512-rev-parse-disambiguation.sh +3 -0
@@ -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
t/t1513-rev-parse-prefix.sh +3 -0
@@ -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' '
t/t1514-rev-parse-push.sh +3 -0
@@ -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 () {
t/t1700-split-index.sh +3 -0
@@ -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
t/t2007-checkout-symlink.sh +3 -0
@@ -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 '
t/t2009-checkout-statinfo.sh +3 -0
@@ -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' '
t/t2010-checkout-ambiguous.sh +3 -0
@@ -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' '
t/t2011-checkout-invalid-head.sh +3 -0
@@ -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' '
t/t2012-checkout-last.sh +3 -0
@@ -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' '
t/t2015-checkout-unborn.sh +3 -0
@@ -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' '
t/t2017-checkout-orphan.sh +3 -0
@@ -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
t/t2020-checkout-detach.sh +3 -0
@@ -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 () {
t/t2022-checkout-paths.sh +3 -0
@@ -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 '
t/t2023-checkout-m.sh +3 -0
@@ -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 '
t/t2027-checkout-track.sh +3 -0
@@ -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' '
t/t2030-unresolve-info.sh +3 -0
@@ -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 () {
t/t2060-switch.sh +3 -0
@@ -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' '
t/t2070-restore.sh +3 -0
@@ -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' '
t/t2400-worktree-add.sh +3 -0
@@ -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
t/t2401-worktree-prune.sh +3 -0
@@ -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 '
t/t2402-worktree-list.sh +3 -0
@@ -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' '
t/t2405-worktree-submodule.sh +3 -0
@@ -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)
t/t3200-branch.sh +3 -0
@@ -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
t/t3201-branch-contains.sh +3 -0
@@ -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 '
t/t3202-show-branch-octopus.sh +3 -0
@@ -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"
t/t3203-branch-output.sh +3 -0
@@ -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
t/t3204-branch-name-interpretation.sh +3 -0
@@ -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() {
t/t3205-branch-color.sh +3 -0
@@ -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' '
t/t3206-range-diff.sh +3 -0
@@ -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
t/t3210-pack-refs.sh +3 -0
@@ -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' '
t/t3211-peel-ref.sh +3 -0
@@ -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' '
t/t3302-notes-index-expensive.sh +3 -0
@@ -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 () {
t/t3303-notes-subtrees.sh +3 -0
@@ -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
t/t3304-notes-mixed.sh +3 -0
@@ -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
t/t3320-notes-merge-worktrees.sh +3 -0
@@ -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' '
t/t3400-rebase.sh +3 -0
@@ -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
t/t3402-rebase-merge.sh +3 -0
@@ -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
t/t3403-rebase-skip.sh +3 -0
@@ -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
t/t3404-rebase-interactive.sh +3 -0
@@ -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
t/t3405-rebase-malformed.sh +3 -0
@@ -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
t/t3406-rebase-message.sh +3 -0
@@ -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' '
t/t3407-rebase-abort.sh +3 -0
@@ -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
t/t3408-rebase-multi-line.sh +3 -0
@@ -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 '
t/t3409-rebase-preserve-merges.sh +3 -0
@@ -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
t/t3412-rebase-root.sh +3 -0
@@ -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 () {
t/t3413-rebase-hook.sh +3 -0
@@ -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 '
t/t3415-rebase-autosquash.sh +3 -0
@@ -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
t/t3416-rebase-onto-threedots.sh +3 -0
@@ -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"
t/t3418-rebase-continue.sh +3 -0
@@ -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
t/t3419-rebase-patch-id.sh +3 -0
@@ -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 () {
t/t3420-rebase-autostash.sh +3 -0
@@ -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 '
t/t3427-rebase-subtree.sh +3 -0
@@ -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
t/t3430-rebase-merges.sh +3 -0
@@ -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
t/t3431-rebase-fork-point.sh +3 -0
@@ -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)
t/t3432-rebase-fast-forward.sh +3 -0
@@ -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 '
t/t3434-rebase-i18n.sh +3 -0
@@ -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 () {
t/t3435-rebase-gpg-sign.sh +3 -0
@@ -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"
t/t3500-cherry.sh +3 -0
@@ -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
t/t3501-revert-cherry-pick.sh +3 -0
@@ -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 '
t/t3502-cherry-pick-merge.sh +3 -0
@@ -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 '
t/t3503-cherry-pick-root.sh +3 -0
@@ -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 '
t/t3504-cherry-pick-rerere.sh +3 -0
@@ -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 '
t/t3505-cherry-pick-empty.sh +3 -0
@@ -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 '
t/t3506-cherry-pick-ff.sh +3 -0
@@ -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 '
t/t3507-cherry-pick-conflict.sh +3 -0
@@ -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 () {
t/t3508-cherry-pick-many-commits.sh +3 -0
@@ -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() {
t/t3509-cherry-pick-merge-df.sh +3 -0
@@ -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' '
t/t3512-cherry-pick-submodule.sh +3 -0
@@ -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
t/t3600-rm.sh +3 -0
@@ -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
t/t3701-add-interactive.sh +3 -0
@@ -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
t/t3901-i18n-patch.sh +3 -0
@@ -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 () {
t/t3903-stash.sh +3 -0
@@ -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 () {
t/t3910-mac-os-precompose.sh +3 -0
@@ -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
t/t4013-diff-various.sh +3 -0
@@ -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
t/t4014-format-patch.sh +3 -0
@@ -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
t/t4017-diff-retval.sh +3 -0
@@ -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' '
t/t4038-diff-combined.sh +3 -0
@@ -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
t/t4041-diff-submodule-option.sh +3 -0
@@ -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
t/t4048-diff-combined-binary.sh +3 -0
@@ -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' '
t/t4052-stat-output.sh +3 -0
@@ -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
t/t4056-diff-order.sh +3 -0
@@ -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 () {
t/t4057-diff-combined-paths.sh +3 -0
@@ -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
t/t4061-diff-indent.sh +3 -0
@@ -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
t/t4066-diff-emit-delay.sh +3 -0
@@ -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
t/t4068-diff-symmetric-merge-base.sh +3 -0
@@ -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:
t/t4103-apply-binary.sh +3 -0
@@ -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' '
t/t4108-apply-threeway.sh +3 -0
@@ -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 () {
t/t4121-apply-diffs.sh +3 -0
@@ -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
t/t4122-apply-symlink-inside.sh +3 -0
@@ -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 '
t/t4150-am.sh +3 -0
@@ -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' '
t/t4200-rerere.sh +3 -0
@@ -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' '
t/t4201-shortlog.sh +3 -0
@@ -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' '
t/t4202-log.sh +3 -0
@@ -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"
t/t4203-mailmap.sh +3 -0
@@ -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 () {
t/t4204-patch-id.sh +3 -0
@@ -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' '
t/t4207-log-decoration-colors.sh +3 -0
@@ -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 '
t/t4208-log-magic-pathspec.sh +3 -0
@@ -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' '
t/t4211-line-log.sh +3 -0
@@ -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)' '
t/t4214-log-graph-octopus.sh +3 -0
@@ -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
t/t4216-log-bloom.sh +3 -0
@@ -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
t/t4253-am-keep-cr-dos.sh +3 -0
@@ -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.
t/t5150-request-pull.sh +3 -0
@@ -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
t/t5304-prune.sh +3 -0
@@ -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))
t/t5305-include-tag.sh +3 -0
@@ -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)
t/t5310-pack-bitmaps.sh +3 -0
@@ -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 () {
t/t5312-prune-corruption.sh +3 -0
@@ -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' '
t/t5317-pack-objects-filter-objects.sh +3 -0
@@ -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.
t/t5322-pack-objects-sparse.sh +3 -0
@@ -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' '
t/t5400-send-pack.sh +3 -0
@@ -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
t/t5402-post-merge-hook.sh +3 -0
@@ -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 '
t/t5403-post-checkout-hook.sh +3 -0
@@ -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 '
t/t5404-tracking-branches.sh +3 -0
@@ -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' '
t/t5405-send-pack-rewind.sh +3 -0
@@ -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 '
t/t5407-post-rewrite-hook.sh +3 -0
@@ -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' '
t/t5410-receive-pack-alternates.sh +3 -0
@@ -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' '
t/t5500-fetch-pack.sh +3 -0
@@ -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.
t/t5501-fetch-push-alternates.sh +3 -0
@@ -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 () {
t/t5502-quickfetch.sh +3 -0
@@ -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 '
t/t5503-tagfollow.sh +3 -0
@@ -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:
t/t5504-fetch-receive-strict.sh +3 -0
@@ -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' '
t/t5505-remote.sh +3 -0
@@ -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 () {
t/t5506-remote-groups.sh +3 -0
@@ -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() {
t/t5509-fetch-push-namespaces.sh +3 -0
@@ -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 '
t/t5510-fetch.sh +3 -0
@@ -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)
t/t5512-ls-remote.sh +3 -0
@@ -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 () {
t/t5514-fetch-multiple.sh +3 -0
@@ -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 () {
t/t5516-fetch-push.sh +3 -0
@@ -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)
t/t5517-push-mirror.sh +3 -0
@@ -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)
t/t5518-fetch-exit-status.sh +3 -0
@@ -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 '
t/t5519-push-alternates.sh +3 -0
@@ -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 '
t/t5520-pull.sh +3 -0
@@ -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 () {
t/t5521-pull-options.sh +3 -0
@@ -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' '
t/t5523-push-upstream.sh +3 -0
@@ -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
t/t5526-fetch-submodules.sh +3 -0
@@ -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)
t/t5527-fetch-odd-refs.sh +3 -0
@@ -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:
t/t5528-push-default.sh +3 -0
@@ -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' '
t/t5531-deep-submodule-push.sh +3 -0
@@ -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 '
t/t5533-push-cas.sh +3 -0
@@ -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 () {
t/t5534-push-signed.sh +3 -0
@@ -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
t/t5537-fetch-shallow.sh +3 -0
@@ -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() {
t/t5538-push-shallow.sh +3 -0
@@ -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() {
t/t5539-fetch-http-shallow.sh +3 -0
@@ -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
t/t5540-http-push-webdav.sh +3 -0
@@ -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 ]
t/t5541-http-push-smart.sh +3 -0
@@ -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"
t/t5542-push-http-shallow.sh +3 -0
@@ -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
t/t5543-atomic-push.sh +3 -0
@@ -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 () {
t/t5545-push-options.sh +3 -0
@@ -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 () {
t/t5550-http-fetch-dumb.sh +3 -0
@@ -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
t/t5551-http-fetch-smart.sh +3 -0
@@ -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
t/t5553-set-upstream.sh +3 -0
@@ -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 () {
t/t5560-http-backend-noserver.sh +3 -0
@@ -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"
t/t5561-http-backend.sh +3 -0
@@ -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
t/t5570-git-daemon.sh +3 -0
@@ -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
t/t5571-pre-push-hook.sh +3 -0
@@ -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
t/t5580-unc-paths.sh +3 -0
@@ -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
t/t5581-http-curl-verbose.sh +3 -0
@@ -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
t/t5582-fetch-negative-refspec.sh +3 -0
@@ -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 '
t/t5601-clone.sh +3 -0
@@ -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=
t/t5604-clone-reference.sh +3 -0
@@ -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)
t/t5605-clone-local.sh +3 -0
@@ -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() {
t/t5606-clone-options.sh +3 -0
@@ -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' '
t/t5607-clone-bundle.sh +3 -0
@@ -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' '
t/t5609-clone-branch.sh +3 -0
@@ -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() {
t/t5610-clone-detached.sh +3 -0
@@ -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() {
t/t5611-clone-config.sh +3 -0
@@ -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' '
t/t5612-clone-refspec.sh +3 -0
@@ -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' '
t/t5616-partial-clone.sh +3 -0
@@ -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.
t/t5617-clone-submodules-remote.sh +3 -0
@@ -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)
t/t5700-protocol-v1.sh +3 -0
@@ -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
t/t5701-git-serve.sh +3 -0
@@ -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' '
t/t5702-protocol-v2.sh +3 -0
@@ -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
t/t5703-upload-pack-ref-in-want.sh +3 -0
@@ -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 () {
t/t5801-remote-helpers.sh +3 -0
@@ -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
t/t6000-rev-list-misc.sh +3 -0
@@ -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 '
t/t6001-rev-list-graft.sh +3 -0
@@ -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 '
t/t6004-rev-list-path-optim.sh +3 -0
@@ -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 '
t/t6006-rev-list-format.sh +3 -0
@@ -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
t/t6007-rev-list-cherry-pick-file.sh +3 -0
@@ -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
t/t6008-rev-list-submodule.sh +3 -0
@@ -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' '
t/t6009-rev-list-parent.sh +3 -0
@@ -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 () {
t/t6012-rev-list-simplify.sh +3 -0
@@ -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 () {
t/t6013-rev-list-reverse-parents.sh +3 -0
@@ -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
t/t6016-rev-list-graph-simplify-history.sh +3 -0
@@ -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' '
t/t6017-rev-list-stdin.sh +3 -0
@@ -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 () {
t/t6018-rev-list-glob.sh +3 -0
@@ -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 () {
t/t6019-rev-list-ancestry-path.sh +3 -0
@@ -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 () {
t/t6030-bisect-porcelain.sh +3 -0
@@ -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()
t/t6040-tracking-info.sh +3 -0
@@ -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 () {
t/t6050-replace.sh +3 -0
@@ -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"
t/t6101-rev-parse-parents.sh +3 -0
@@ -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 () {
t/t6110-rev-list-sparse.sh +3 -0
@@ -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 '
t/t6111-rev-list-treesame.sh +3 -0
@@ -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 () {
t/t6112-rev-list-filters-objects.sh +3 -0
@@ -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.
t/t6120-describe.sh +3 -0
@@ -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 () {
t/t6200-fmt-merge-msg.sh +3 -0
@@ -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"
t/t6300-for-each-ref.sh +3 -0
@@ -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
t/t6302-for-each-ref-filter.sh +3 -0
@@ -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
t/t6400-merge-df.sh +3 -0
@@ -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' '
t/t6402-merge-rename.sh +3 -0
@@ -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 () {
t/t6404-recursive-merge.sh +3 -0
@@ -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.
t/t6405-merge-symlinks.sh +3 -0
@@ -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' '
t/t6406-merge-attr.sh +3 -0
@@ -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 '
t/t6407-merge-binary.sh +3 -0
@@ -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 '
t/t6409-merge-subtree.sh +3 -0
@@ -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 '
t/t6411-merge-filemode.sh +3 -0
@@ -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' '
t/t6412-merge-large-rename.sh +3 -0
@@ -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() {
t/t6413-merge-crlf.sh +3 -0
@@ -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 '
t/t6414-merge-rename-nocruft.sh +3 -0
@@ -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' '
t/t6415-merge-dir-to-symlink.sh +3 -0
@@ -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' '
t/t6416-recursive-corner-cases.sh +3 -0
@@ -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
t/t6417-merge-ours-theirs.sh +3 -0
@@ -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 '
t/t6418-merge-text-auto.sh +3 -0
@@ -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
t/t6419-merge-ignorecase.sh +3 -0
@@ -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
t/t6422-merge-rename-corner-cases.sh +3 -0
@@ -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
t/t6425-merge-rename-delete.sh +3 -0
@@ -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' '
t/t6427-diff3-conflict-markers.sh +3 -0
@@ -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:
t/t6430-merge-recursive.sh +3 -0
@@ -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
t/t6432-merge-recursive-space-options.sh +3 -0
@@ -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
t/t6433-merge-toplevel.sh +3 -0
@@ -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 () {
t/t6434-merge-recursive-rename-options.sh +3 -0
@@ -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 () {
t/t6436-merge-overwrite.sh +3 -0
@@ -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' '
t/t6437-submodule-merge.sh +3 -0
@@ -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 #
t/t6439-merge-co-error-msgs.sh +3 -0
@@ -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
t/t6501-freshen-objects.sh +3 -0
@@ -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
t/t7003-filter-branch.sh +3 -0
@@ -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"
t/t7004-tag.sh +3 -0
@@ -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
t/t7030-verify-tag.sh +3 -0
@@ -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"
t/t7060-wtstatus.sh +3 -0
@@ -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 '
t/t7063-status-untracked-cache.sh +3 -0
@@ -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
t/t7064-wtstatus-pv2.sh +3 -0
@@ -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
t/t7102-reset.sh +3 -0
@@ -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 () {
t/t7113-post-index-change-hook.sh +3 -0
@@ -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' '
t/t7201-co.sh +3 -0
@@ -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
t/t7400-submodule-basic.sh +3 -0
@@ -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' '
t/t7403-submodule-sync.sh +3 -0
@@ -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 '
t/t7406-submodule-update.sh +3 -0
@@ -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
t/t7407-submodule-foreach.sh +3 -0
@@ -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
t/t7409-submodule-detached-work-tree.sh +3 -0
@@ -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' '
t/t7417-submodule-path-url.sh +3 -0
@@ -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' '
t/t7501-commit-basic-functionality.sh +3 -0
@@ -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"
t/t7502-commit-porcelain.sh +3 -0
@@ -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 () {
t/t7503-pre-commit-and-pre-merge-commit-hooks.sh +3 -0
@@ -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"
t/t7504-commit-msg-hook.sh +3 -0
@@ -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' '
t/t7505-prepare-commit-msg-hook.sh +3 -0
@@ -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' '
t/t7510-signed-commit.sh +3 -0
@@ -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"
t/t7512-status-help.sh +3 -0
@@ -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
t/t7517-per-repo-email.sh +3 -0
@@ -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' '
t/t7600-merge.sh +3 -0
@@ -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
t/t7608-merge-messages.sh +3 -0
@@ -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() {
t/t7610-mergetool.sh +3 -0
@@ -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
t/t7611-merge-abort.sh +3 -0
@@ -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' '
t/t7612-merge-verify-signatures.sh +3 -0
@@ -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"
t/t7614-merge-signoff.sh +3 -0
@@ -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
t/t7701-repack-unpack-unreachable.sh +3 -0
@@ -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=
t/t7800-difftool.sh +3 -0
@@ -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 ()
t/t7810-grep.sh +3 -0
@@ -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
t/t8001-annotate.sh +3 -0
@@ -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'
t/t8002-blame.sh +3 -0
@@ -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'
t/t8003-blame-corner-cases.sh +3 -0
@@ -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/'
t/t8004-blame-with-conflicts.sh +3 -0
@@ -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' '
t/t8012-blame-colors.sh +3 -0
@@ -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'
t/t9001-send-email.sh +3 -0
@@ -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
t/t9100-git-svn-basic.sh +3 -0
@@ -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
t/t9145-git-svn-master-branch.sh +3 -0
@@ -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' '
t/t9151-svn-mergeinfo.sh +3 -0
@@ -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' "
t/t9155-git-svn-fetch-deleted-tag.sh +3 -0
@@ -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' '
t/t9156-git-svn-fetch-deleted-tag-2.sh +3 -0
@@ -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' '
t/t9163-git-svn-reset-clears-caches.sh +3 -0
@@ -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)"
t/t9169-git-svn-dcommit-crlf.sh +3 -0
@@ -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' '
t/t9300-fast-import.sh +3 -0
@@ -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
t/t9301-fast-import-notes.sh +3 -0
@@ -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
t/t9350-fast-export.sh +3 -0
@@ -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' '
t/t9351-fast-export-anonymize.sh +3 -0
@@ -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' '
t/t9400-git-cvsserver-server.sh +3 -0
@@ -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
t/t9401-git-cvsserver-crlf.sh +3 -0
@@ -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 () {
t/t9402-git-cvsserver-refs.sh +3 -0
@@ -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 #########
t/t9500-gitweb-standalone-no-errors.sh +3 -0
@@ -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 # ----------------------------------------------------------------------
t/t9501-gitweb-standalone-http-status.sh +3 -0
@@ -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 #
t/t9502-gitweb-standalone-parse-output.sh +3 -0
@@ -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 # ----------------------------------------------------------------------
t/t9600-cvsimport.sh +3 -0
@@ -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
t/t9601-cvsimport-vendor-branch.sh +3 -0
@@ -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
t/t9602-cvsimport-branches-tags.sh +3 -0
@@ -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
t/t9603-cvsimport-patchsets.sh +3 -0
@@ -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
t/t9800-git-p4-basic.sh +3 -0
@@ -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' '
t/t9801-git-p4-branch.sh +3 -0
@@ -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' '
t/t9806-git-p4-options.sh +3 -0
@@ -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' '
t/t9807-git-p4-submit.sh +3 -0
@@ -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' '
t/t9811-git-p4-label-import.sh +3 -0
@@ -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' '
t/t9902-completion.sh +3 -0
@@ -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 ()
t/t9903-bash-prompt.sh +3 -0
@@ -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"
Signature · 1 line
gitgitgadget
PATCH v3 2/28 t0060: preemptively adjust alignment
In reply to Johannes Schindelin via GitGitGadgetFrom: Johannes Schindelin <[email protected]>
We are about to adjust t0060 for the new default branch name main. This name is two characters shorter and therefore needs two spaces more padding to align correctly.
Adjusting the alignment before the big search-and-replace makes it easier to verify that the final result does not leave any misaligned lines behind.
Signed-off-by Johannes Schindelin <[email protected]>
--- t/t0060-path-utils.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
t/t0060-path-utils.sh +2 -2
@@ -312,8 +312,8 @@ test_git_path GIT_COMMON_DIR=bar info/sparse-checkout .git/info/sparse-check test_git_path GIT_COMMON_DIR=bar info//sparse-checkout .git/info//sparse-checkout test_git_path GIT_COMMON_DIR=bar remotes/bar bar/remotes/bar test_git_path GIT_COMMON_DIR=bar branches/bar bar/branches/bar -test_git_path GIT_COMMON_DIR=bar logs/refs/heads/master bar/logs/refs/heads/master -test_git_path GIT_COMMON_DIR=bar refs/heads/master bar/refs/heads/master +test_git_path GIT_COMMON_DIR=bar logs/refs/heads/master bar/logs/refs/heads/master +test_git_path GIT_COMMON_DIR=bar refs/heads/master bar/refs/heads/master test_git_path GIT_COMMON_DIR=bar refs/bisect/foo .git/refs/bisect/foo test_git_path GIT_COMMON_DIR=bar hooks/me bar/hooks/me test_git_path GIT_COMMON_DIR=bar config bar/config
Signature · 1 line
gitgitgadget
PATCH v3 3/28 t[01]*: adjust the references to the default branch name "main"
In reply to Johannes Schindelin via GitGitGadgetFrom: Johannes Schindelin <[email protected]>
Carefully excluding t1309, which sees independent development elsewhere at the time of writing, we transition above-mentioned tests to the default branch name main. This trick was performed via
$ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -e 's/naster/nain/g' -- t[01]*.sh && git checkout HEAD -- t1309\*)
Note that t5533 contains a variation of the name master (naster) that we rename here, too.
This allows us to define GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main for those tests.
Signed-off-by Johannes Schindelin <[email protected]>
--- t/t0002-gitfile.sh | 8 ++-- t/t0020-crlf.sh | 10 ++-- t/t0021-conversion.sh | 42 ++++++++--------- t/t0027-auto-crlf.sh | 4 +- t/t0028-working-tree-encoding.sh | 6 +-- t/t0041-usage.sh | 12 ++--- t/t0050-filesystem.sh | 8 ++-- t/t0060-path-utils.sh | 4 +- t/t0100-previous.sh | 20 ++++---- t/t1004-read-tree-m-u-wf.sh | 42 ++++++++--------- t/t1008-read-tree-overlay.sh | 4 +- t/t1009-read-tree-new-index.sh | 6 +-- t/t1011-read-tree-sparse-checkout.sh | 2 +- t/t1021-rerere-in-workdir.sh | 4 +- t/t1090-sparse-checkout-scope.sh | 12 ++--- t/t1091-sparse-checkout-builtin.sh | 4 +- t/t1300-config.sh | 10 ++-- t/t1301-shared-repo.sh | 6 +-- t/t1305-config-include.sh | 2 +- t/t1400-update-ref.sh | 70 ++++++++++++++-------------- t/t1402-check-ref-format.sh | 32 ++++++------- t/t1403-show-ref.sh | 20 ++++---- t/t1405-main-ref-store.sh | 44 ++++++++--------- t/t1406-submodule-ref-store.sh | 32 ++++++------- t/t1407-worktree-ref-store.sh | 34 +++++++------- t/t1408-packed-refs.sh | 14 +++--- t/t1410-reflog.sh | 58 +++++++++++------------ t/t1411-reflog-show.sh | 4 +- t/t1413-reflog-detach.sh | 26 +++++------ t/t1414-reflog-walk.sh | 14 +++--- t/t1416-ref-transaction-hooks.sh | 12 ++--- t/t1430-bad-ref-name.sh | 54 ++++++++++----------- t/t1450-fsck.sh | 2 +- t/t1500-rev-parse.sh | 6 +-- t/t1503-rev-parse-verify.sh | 30 ++++++------ t/t1505-rev-parse-last.sh | 10 ++-- t/t1506-rev-parse-diagnosis.sh | 6 +-- t/t1507-rev-parse-upstream.sh | 42 ++++++++--------- t/t1508-at-combinations.sh | 12 ++--- t/t1511-rev-parse-caret.sh | 28 +++++------ t/t1512-rev-parse-disambiguation.sh | 4 +- t/t1513-rev-parse-prefix.sh | 6 +-- t/t1514-rev-parse-push.sh | 18 +++---- t/t1700-split-index.sh | 4 +- 44 files changed, 394 insertions(+), 394 deletions(-)
t/t0002-gitfile.sh +4 -4
@@ -4,7 +4,7 @@ test_description='.git file Verify that plumbing commands work when .git is a file ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -99,7 +99,7 @@ test_expect_success 'enter_repo non-strict mode' ' git ls-remote enter_repo >actual && cat >expected <<-EOF && $head HEAD - $head refs/heads/master + $head refs/heads/main $head refs/tags/foo EOF test_cmp expected actual
@@ -114,7 +114,7 @@ test_expect_success 'enter_repo linked checkout' ' git ls-remote foo >actual && cat >expected <<-EOF && $head HEAD - $head refs/heads/master + $head refs/heads/main $head refs/tags/foo EOF test_cmp expected actual
@@ -125,7 +125,7 @@ test_expect_success 'enter_repo strict mode' ' git ls-remote --upload-pack="git upload-pack --strict" foo/.git >actual && cat >expected <<-EOF && $head HEAD - $head refs/heads/master + $head refs/heads/main $head refs/tags/foo EOF test_cmp expected actual
t/t0020-crlf.sh +5 -5
@@ -2,7 +2,7 @@ test_description='CRLF conversion' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -321,8 +321,8 @@ test_expect_success 'checkout with existing .gitattributes' ' git add .gitattributes .file && git commit -m second && - git checkout master~1 && - git checkout master && + git checkout main~1 && + git checkout main && test "$(git diff-files --raw)" = "" '
@@ -334,8 +334,8 @@ test_expect_success 'checkout when deleting .gitattributes' ' git add .file2 && git commit -m third && - git checkout master~1 && - git checkout master && + git checkout main~1 && + git checkout main && has_cr .file2 '
t/t0021-conversion.sh +21 -21
108 lines not on this page · raw message
t/t0027-auto-crlf.sh +2 -2
@@ -368,9 +368,9 @@ test_expect_success 'ls-files --eol -o Text/Binary' ' test_cmp expect actual ' -test_expect_success 'setup master' ' +test_expect_success 'setup main' ' echo >.gitattributes && - git checkout -b master && + git checkout -b main && git add .gitattributes && git commit -m "add .gitattributes" . && printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\nLINETWO\nLINETHREE" >LF &&
t/t0028-working-tree-encoding.sh +3 -3
@@ -2,7 +2,7 @@ test_description='working-tree-encoding conversion via gitattributes' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -218,7 +218,7 @@ test_expect_success 'error if encoding round trip is not the same during refresh TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16le) && git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16le && COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) && - git update-ref refs/heads/master $COMMIT && + git update-ref refs/heads/main $COMMIT && test_must_fail git checkout HEAD^ 2>err.out && test_i18ngrep "error: .* overwritten by checkout:" err.out
@@ -234,7 +234,7 @@ test_expect_success 'error if encoding garbage is already in Git' ' TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16) && git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16 && COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) && - git update-ref refs/heads/master $COMMIT && + git update-ref refs/heads/main $COMMIT && git diff 2>err.out && test_i18ngrep "error: BOM is required" err.out
t/t0041-usage.sh +6 -6
@@ -2,7 +2,7 @@ test_description='Test commands behavior when given invalid argument value' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -44,8 +44,8 @@ test_expect_success 'tag usage error' ' ' test_expect_success 'branch --contains <existent_commit>' ' - git branch --contains "master" >actual 2>actual.err && - test_i18ngrep "master" actual && + git branch --contains "main" >actual 2>actual.err && + test_i18ngrep "main" actual && test_line_count = 0 actual.err '
@@ -57,7 +57,7 @@ test_expect_success 'branch --contains <inexistent_commit>' ' ' test_expect_success 'branch --no-contains <existent_commit>' ' - git branch --no-contains "master" >actual 2>actual.err && + git branch --no-contains "main" >actual 2>actual.err && test_line_count = 0 actual && test_line_count = 0 actual.err '
@@ -76,7 +76,7 @@ test_expect_success 'branch usage error' ' ' test_expect_success 'for-each-ref --contains <existent_object>' ' - git for-each-ref --contains "master" >actual 2>actual.err && + git for-each-ref --contains "main" >actual 2>actual.err && test_line_count = 2 actual && test_line_count = 0 actual.err '
@@ -89,7 +89,7 @@ test_expect_success 'for-each-ref --contains <inexistent_object>' ' ' test_expect_success 'for-each-ref --no-contains <existent_object>' ' - git for-each-ref --no-contains "master" >actual 2>actual.err && + git for-each-ref --no-contains "main" >actual 2>actual.err && test_line_count = 0 actual && test_line_count = 0 actual.err '
t/t0050-filesystem.sh +4 -4
@@ -2,7 +2,7 @@ test_description='Various filesystem issues' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -68,7 +68,7 @@ test_expect_success "setup case tests" ' git mv camelcase tmp && git mv tmp CamelCase && git commit -m "rename" && - git checkout -f master + git checkout -f main ' test_expect_success 'rename (case change)' '
@@ -121,7 +121,7 @@ test_expect_success "setup unicode normalization tests" ' git mv $aumlcdiar tmp && git mv tmp "$auml" && git commit -m rename && - git checkout -f master + git checkout -f main ' $test_unicode 'rename (silent unicode normalization)' '
@@ -150,7 +150,7 @@ test_expect_success CASE_INSENSITIVE_FS 'checkout with no pathspec and a case in git add gitweb && git commit -m "add gitweb/subdir/file" && - git checkout master + git checkout main ) '
t/t0060-path-utils.sh +2 -2
@@ -312,8 +312,8 @@ test_git_path GIT_COMMON_DIR=bar info/sparse-checkout .git/info/sparse-check test_git_path GIT_COMMON_DIR=bar info//sparse-checkout .git/info//sparse-checkout test_git_path GIT_COMMON_DIR=bar remotes/bar bar/remotes/bar test_git_path GIT_COMMON_DIR=bar branches/bar bar/branches/bar -test_git_path GIT_COMMON_DIR=bar logs/refs/heads/master bar/logs/refs/heads/master -test_git_path GIT_COMMON_DIR=bar refs/heads/master bar/refs/heads/master +test_git_path GIT_COMMON_DIR=bar logs/refs/heads/main bar/logs/refs/heads/main +test_git_path GIT_COMMON_DIR=bar refs/heads/main bar/refs/heads/main test_git_path GIT_COMMON_DIR=bar refs/bisect/foo .git/refs/bisect/foo test_git_path GIT_COMMON_DIR=bar hooks/me bar/hooks/me test_git_path GIT_COMMON_DIR=bar config bar/config
t/t0100-previous.sh +10 -10
@@ -2,7 +2,7 @@ test_description='previous branch syntax @{-n}' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -11,7 +11,7 @@ test_expect_success 'branch -d @{-1}' ' test_commit A && git checkout -b junk && git checkout - && - test "$(git symbolic-ref HEAD)" = refs/heads/master && + test "$(git symbolic-ref HEAD)" = refs/heads/main && git branch -d @{-1} && test_must_fail git rev-parse --verify refs/heads/junk '
@@ -20,9 +20,9 @@ test_expect_success 'branch -d @{-12} when there is not enough switches yet' ' git reflog expire --expire=now && git checkout -b junk2 && git checkout - && - test "$(git symbolic-ref HEAD)" = refs/heads/master && + test "$(git symbolic-ref HEAD)" = refs/heads/main && test_must_fail git branch -d @{-12} && - git rev-parse --verify refs/heads/master + git rev-parse --verify refs/heads/main ' test_expect_success 'merge @{-1}' '
@@ -31,19 +31,19 @@ test_expect_success 'merge @{-1}' ' git checkout A && test_commit C && test_commit D && - git branch -f master B && + git branch -f main B && git branch -f other && git checkout other && - git checkout master && + git checkout main && git merge @{-1} && git cat-file commit HEAD | grep "Merge branch '\''other'\''" ' test_expect_success 'merge @{-1}~1' ' - git checkout master && + git checkout main && git reset --hard B && git checkout other && - git checkout master && + git checkout main && git merge @{-1}~1 && git cat-file commit HEAD >actual && grep "Merge branch '\''other'\''" actual
@@ -51,11 +51,11 @@ test_expect_success 'merge @{-1}~1' ' test_expect_success 'merge @{-100} before checking out that many branches yet' ' git reflog expire --expire=now && - git checkout -f master && + git checkout -f main && git reset --hard B && git branch -f other C && git checkout other && - git checkout master && + git checkout main && test_must_fail git merge @{-100} '
t/t1004-read-tree-m-u-wf.sh +21 -21
98 lines not on this page · raw message
t/t1008-read-tree-overlay.sh +2 -2
@@ -2,7 +2,7 @@ test_description='test multi-tree read-tree without merging' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -25,7 +25,7 @@ test_expect_success setup ' ' test_expect_success 'multi-read' ' - read_tree_must_succeed initial master side && + read_tree_must_succeed initial main side && test_write_lines a b/c >expect && git ls-files >actual && test_cmp expect actual
t/t1009-read-tree-new-index.sh +3 -3
@@ -2,7 +2,7 @@ test_description='test read-tree into a fresh index file' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -15,13 +15,13 @@ test_expect_success setup ' test_expect_success 'non-existent index file' ' rm -f new-index && - GIT_INDEX_FILE=new-index git read-tree master + GIT_INDEX_FILE=new-index git read-tree main ' test_expect_success 'empty index file' ' rm -f new-index && > new-index && - GIT_INDEX_FILE=new-index git read-tree master + GIT_INDEX_FILE=new-index git read-tree main ' test_done
t/t1011-read-tree-sparse-checkout.sh +1 -1
@@ -2,7 +2,7 @@ test_description='sparse checkout tests -* (tag: removed, master) removed +* (tag: removed, main) removed | D sub/added * (HEAD, tag: top) modified and added | M init.t
t/t1021-rerere-in-workdir.sh +2 -2
@@ -1,7 +1,7 @@ #!/bin/sh test_description='rerere run in a workdir' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -22,7 +22,7 @@ test_expect_success SYMLINKS setup ' test_tick && git commit -a -m goodbye && - git checkout master + git checkout main ' test_expect_success SYMLINKS 'rerere in workdir' '
t/t1090-sparse-checkout-scope.sh +6 -6
@@ -2,7 +2,7 @@ test_description='sparse checkout scope tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -23,18 +23,18 @@ test_expect_success 'create feature branch' ' git commit -m "modification" ' -test_expect_success 'perform sparse checkout of master' ' +test_expect_success 'perform sparse checkout of main' ' git config --local --bool core.sparsecheckout true && echo "!/*" >.git/info/sparse-checkout && echo "/a" >>.git/info/sparse-checkout && echo "/c" >>.git/info/sparse-checkout && - git checkout master && + git checkout main && test_path_is_file a && test_path_is_missing b && test_path_is_file c ' -test_expect_success 'merge feature branch into sparse checkout of master' ' +test_expect_success 'merge feature branch into sparse checkout of main' ' git merge feature && test_path_is_file a && test_path_is_missing b &&
@@ -42,10 +42,10 @@ test_expect_success 'merge feature branch into sparse checkout of master' ' test "$(cat c)" = "modified" ' -test_expect_success 'return to full checkout of master' ' +test_expect_success 'return to full checkout of main' ' git checkout feature && echo "/*" >.git/info/sparse-checkout && - git checkout master && + git checkout main && test_path_is_file a && test_path_is_file b && test_path_is_file c &&
t/t1091-sparse-checkout-builtin.sh +2 -2
@@ -2,7 +2,7 @@ test_description='sparse checkout builtin tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -120,7 +120,7 @@ test_expect_success 'interaction with clone --no-checkout (unborn index)' ' test_path_is_missing clone_no_checkout/.git/index && # No branch is checked out until we manually switch to one - git -C clone_no_checkout switch master && + git -C clone_no_checkout switch main && test_path_is_file clone_no_checkout/.git/index && check_files clone_no_checkout a folder1 '
t/t1300-config.sh +5 -5
@@ -5,7 +5,7 @@ test_description='Test git config in different settings' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -1057,8 +1057,8 @@ test_expect_success 'check split_cmdline return' " echo foo > foo && git add foo && git commit -m 'initial commit' && - git config branch.master.mergeoptions 'echo \"' && - test_must_fail git merge master + git config branch.main.mergeoptions 'echo \"' && + test_must_fail git merge main " test_expect_success 'git -c "key=value" support' '
@@ -1772,11 +1772,11 @@ test_expect_success '--show-origin blob' ' test_expect_success '--show-origin blob ref' ' cat >expect <<-\EOF && - blob:master:custom.conf user.custom=true + blob:main:custom.conf user.custom=true EOF git add "$CUSTOM_CONFIG_FILE" && git commit -m "new config file" && - git config --blob=master:"$CUSTOM_CONFIG_FILE" --show-origin --list >output && + git config --blob=main:"$CUSTOM_CONFIG_FILE" --show-origin --list >output && test_cmp expect output '
t/t1301-shared-repo.sh +3 -3
@@ -5,7 +5,7 @@ test_description='Test shared repository initialization' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -118,13 +118,13 @@ test_expect_success POSIXPERM 'git reflog expire honors core.sharedRepository' ' umask 077 && git config core.sharedRepository group && git reflog expire --all && - actual="$(ls -l .git/logs/refs/heads/master)" && + actual="$(ls -l .git/logs/refs/heads/main)" && case "$actual" in -rw-rw-*) : happy ;; *) - echo Ooops, .git/logs/refs/heads/master is not 0662 [$actual] + echo Ooops, .git/logs/refs/heads/main is not 0662 [$actual] false ;; esac
t/t1305-config-include.sh +1 -1
@@ -312,7 +312,7 @@ test_expect_success SYMLINKS 'conditional include, gitdir matching symlink, icas test_expect_success 'conditional include, onbranch' ' echo "[includeIf \"onbranch:foo-branch\"]path=bar9" >>.git/config && echo "[test]nine=9" >.git/bar9 && - git checkout -b master && + git checkout -b main && test_must_fail git config test.nine && git checkout -b foo-branch && echo 9 >expect &&
t/t1400-update-ref.sh +35 -35
163 lines not on this page · raw message
t/t1402-check-ref-format.sh +16 -16
@@ -134,18 +134,18 @@ valid_ref !MINGW "$ref" '--refspec-pattern --allow-onelevel --normalize' test_expect_success "check-ref-format --branch @{-1}" ' T=$(git write-tree) && sha1=$(echo A | git commit-tree $T) && - git update-ref refs/heads/master $sha1 && - git update-ref refs/remotes/origin/master $sha1 && - git checkout master && - git checkout origin/master && - git checkout master && + git update-ref refs/heads/main $sha1 && + git update-ref refs/remotes/origin/main $sha1 && + git checkout main && + git checkout origin/main && + git checkout main && refname=$(git check-ref-format --branch @{-1}) && test "$refname" = "$sha1" && refname2=$(git check-ref-format --branch @{-2}) && - test "$refname2" = master' + test "$refname2" = main' -test_expect_success 'check-ref-format --branch -naster' ' - test_must_fail git check-ref-format --branch -naster >actual && +test_expect_success 'check-ref-format --branch -nain' ' + test_must_fail git check-ref-format --branch -nain >actual && test_must_be_empty actual '
@@ -154,11 +154,11 @@ test_expect_success 'check-ref-format --branch from subdir' ' T=$(git write-tree) && sha1=$(echo A | git commit-tree $T) && - git update-ref refs/heads/master $sha1 && - git update-ref refs/remotes/origin/master $sha1 && - git checkout master && - git checkout origin/master && - git checkout master && + git update-ref refs/heads/main $sha1 && + git update-ref refs/remotes/origin/main $sha1 && + git checkout main && + git checkout origin/main && + git checkout main && refname=$( cd subdir && git check-ref-format --branch @{-1}
@@ -171,9 +171,9 @@ test_expect_success 'check-ref-format --branch @{-1} from non-repo' ' test_must_be_empty actual ' -test_expect_success 'check-ref-format --branch master from non-repo' ' - echo master >expect && - nongit git check-ref-format --branch master >actual && +test_expect_success 'check-ref-format --branch main from non-repo' ' + echo main >expect && + nongit git check-ref-format --branch main >actual && test_cmp expect actual '
t/t1403-show-ref.sh +10 -10
@@ -1,7 +1,7 @@ #!/bin/sh test_description='show-ref' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -12,7 +12,7 @@ test_expect_success setup ' git checkout -b side && test_commit B && git tag -f -a -m "annotated B" B && - git checkout master && + git checkout main && test_commit C && git branch B A^0 '
@@ -95,23 +95,23 @@ test_expect_success 'show-ref -d' ' git show-ref --verify -d refs/tags/A refs/tags/C >actual && test_cmp expect actual && - echo $(git rev-parse refs/heads/master) refs/heads/master >expect && - git show-ref -d master >actual && + echo $(git rev-parse refs/heads/main) refs/heads/main >expect && + git show-ref -d main >actual && test_cmp expect actual && - git show-ref -d heads/master >actual && + git show-ref -d heads/main >actual && test_cmp expect actual && - git show-ref -d refs/heads/master >actual && + git show-ref -d refs/heads/main >actual && test_cmp expect actual && - git show-ref -d --verify refs/heads/master >actual && + git show-ref -d --verify refs/heads/main >actual && test_cmp expect actual && - test_must_fail git show-ref -d --verify master >actual && + test_must_fail git show-ref -d --verify main >actual && test_must_be_empty actual && - test_must_fail git show-ref -d --verify heads/master >actual && + test_must_fail git show-ref -d --verify heads/main >actual && test_must_be_empty actual && test_must_fail git show-ref --verify -d A C >actual &&
@@ -123,7 +123,7 @@ test_expect_success 'show-ref -d' ' ' test_expect_success 'show-ref --heads, --tags, --head, pattern' ' - for branch in B master side + for branch in B main side do echo $(git rev-parse refs/heads/$branch) refs/heads/$branch done >expect.heads &&
t/t1405-main-ref-store.sh +22 -22
99 lines not on this page · raw message
t/t1406-submodule-ref-store.sh +16 -16
@@ -2,7 +2,7 @@ test_description='test submodule ref store api' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -14,7 +14,7 @@ test_expect_success 'setup' ' ( cd sub && test_commit first && - git checkout -b new-master + git checkout -b new-main ) '
@@ -30,7 +30,7 @@ test_expect_success 'peel_ref(new-tag)' ' ' test_expect_success 'create_symref() not allowed' ' - test_must_fail $RUN create-symref FOO refs/heads/master nothing + test_must_fail $RUN create-symref FOO refs/heads/main nothing ' test_expect_success 'delete_refs() not allowed' '
@@ -38,14 +38,14 @@ test_expect_success 'delete_refs() not allowed' ' ' test_expect_success 'rename_refs() not allowed' ' - test_must_fail $RUN rename-ref refs/heads/master refs/heads/new-master + test_must_fail $RUN rename-ref refs/heads/main refs/heads/new-main ' test_expect_success 'for_each_ref(refs/heads/)' ' $RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual && cat >expected <<-\EOF && - master 0x0 - new-master 0x0 + main 0x0 + new-main 0x0 EOF test_cmp expected actual '
@@ -56,23 +56,23 @@ test_expect_success 'for_each_ref() is sorted' ' test_cmp expected actual ' -test_expect_success 'resolve_ref(master)' ' - SHA1=`git -C sub rev-parse master` && - echo "$SHA1 refs/heads/master 0x0" >expected && - $RUN resolve-ref refs/heads/master 0 >actual && +test_expect_success 'resolve_ref(main)' ' + SHA1=`git -C sub rev-parse main` && + echo "$SHA1 refs/heads/main 0x0" >expected && + $RUN resolve-ref refs/heads/main 0 >actual && test_cmp expected actual ' -test_expect_success 'verify_ref(new-master)' ' - $RUN verify-ref refs/heads/new-master +test_expect_success 'verify_ref(new-main)' ' + $RUN verify-ref refs/heads/new-main ' test_expect_success 'for_each_reflog()' ' $RUN for-each-reflog | sort | cut -d" " -f 2- >actual && cat >expected <<-\EOF && HEAD 0x1 - refs/heads/master 0x0 - refs/heads/new-master 0x0 + refs/heads/main 0x0 + refs/heads/new-main 0x0 EOF test_cmp expected actual '
@@ -80,12 +80,12 @@ test_expect_success 'for_each_reflog()' ' test_expect_success 'for_each_reflog_ent()' ' $RUN for-each-reflog-ent HEAD >actual && head -n1 actual | grep first && - tail -n2 actual | head -n1 | grep master.to.new + tail -n2 actual | head -n1 | grep main.to.new ' test_expect_success 'for_each_reflog_ent_reverse()' ' $RUN for-each-reflog-ent-reverse HEAD >actual && - head -n1 actual | grep master.to.new && + head -n1 actual | grep main.to.new && tail -n2 actual | head -n1 | grep first '
t/t1407-worktree-ref-store.sh +17 -17
@@ -2,7 +2,7 @@ test_description='test worktree ref store api' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -12,7 +12,7 @@ RMAIN="test-tool ref-store worktree:main" test_expect_success 'setup' ' test_commit first && - git worktree add -b wt-master wt && + git worktree add -b wt-main wt && ( cd wt && test_commit second
@@ -20,34 +20,34 @@ test_expect_success 'setup' ' ' test_expect_success 'resolve_ref(<shared-ref>)' ' - SHA1=`git rev-parse master` && - echo "$SHA1 refs/heads/master 0x0" >expected && - $RWT resolve-ref refs/heads/master 0 >actual && + SHA1=`git rev-parse main` && + echo "$SHA1 refs/heads/main 0x0" >expected && + $RWT resolve-ref refs/heads/main 0 >actual && test_cmp expected actual && - $RMAIN resolve-ref refs/heads/master 0 >actual && + $RMAIN resolve-ref refs/heads/main 0 >actual && test_cmp expected actual ' test_expect_success 'resolve_ref(<per-worktree-ref>)' ' SHA1=`git -C wt rev-parse HEAD` && - echo "$SHA1 refs/heads/wt-master 0x1" >expected && + echo "$SHA1 refs/heads/wt-main 0x1" >expected && $RWT resolve-ref HEAD 0 >actual && test_cmp expected actual && SHA1=`git rev-parse HEAD` && - echo "$SHA1 refs/heads/master 0x1" >expected && + echo "$SHA1 refs/heads/main 0x1" >expected && $RMAIN resolve-ref HEAD 0 >actual && test_cmp expected actual ' -test_expect_success 'create_symref(FOO, refs/heads/master)' ' - $RWT create-symref FOO refs/heads/master nothing && - echo refs/heads/master >expected && +test_expect_success 'create_symref(FOO, refs/heads/main)' ' + $RWT create-symref FOO refs/heads/main nothing && + echo refs/heads/main >expected && git -C wt symbolic-ref FOO >actual && test_cmp expected actual && - $RMAIN create-symref FOO refs/heads/wt-master nothing && - echo refs/heads/wt-master >expected && + $RMAIN create-symref FOO refs/heads/wt-main nothing && + echo refs/heads/wt-main >expected && git symbolic-ref FOO >actual && test_cmp expected actual '
@@ -66,8 +66,8 @@ test_expect_success 'for_each_reflog()' ' HEAD 0x1 PSEUDO-WT 0x0 refs/bisect/wt-random 0x0 - refs/heads/master 0x0 - refs/heads/wt-master 0x0 + refs/heads/main 0x0 + refs/heads/wt-main 0x0 EOF test_cmp expected actual &&
@@ -76,8 +76,8 @@ test_expect_success 'for_each_reflog()' ' HEAD 0x1 PSEUDO-MAIN 0x0 refs/bisect/random 0x0 - refs/heads/master 0x0 - refs/heads/wt-master 0x0 + refs/heads/main 0x0 + refs/heads/wt-main 0x0 EOF test_cmp expected actual '
t/t1408-packed-refs.sh +7 -7
@@ -2,7 +2,7 @@ test_description='packed-refs entries are covered by loose refs' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -12,32 +12,32 @@ test_expect_success setup ' git commit --allow-empty -m one && one=$(git rev-parse HEAD) && git for-each-ref >actual && - echo "$one commit refs/heads/master" >expect && + echo "$one commit refs/heads/main" >expect && test_cmp expect actual && git pack-refs --all && git for-each-ref >actual && - echo "$one commit refs/heads/master" >expect && + echo "$one commit refs/heads/main" >expect && test_cmp expect actual && git checkout --orphan another && test_tick && git commit --allow-empty -m two && two=$(git rev-parse HEAD) && - git checkout -B master && + git checkout -B main && git branch -D another && git for-each-ref >actual && - echo "$two commit refs/heads/master" >expect && + echo "$two commit refs/heads/main" >expect && test_cmp expect actual && git reflog expire --expire=now --all && git prune && - git tag -m v1.0 v1.0 master + git tag -m v1.0 v1.0 main ' test_expect_success 'no error from stale entry in packed-refs' ' - git describe master >actual 2>&1 && + git describe main >actual 2>&1 && echo "v1.0" >expect && test_cmp expect actual '
t/t1410-reflog.sh +29 -29
169 lines not on this page · raw message
t/t1411-reflog-show.sh +2 -2
@@ -1,7 +1,7 @@ #!/bin/sh test_description='Test reflog display routines' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -170,7 +170,7 @@ test_expect_success 'git log -g -p shows diffs vs. parents' ' ' test_expect_success 'reflog exists works' ' - git reflog exists refs/heads/master && + git reflog exists refs/heads/main && ! git reflog exists refs/heads/nonexistent '
t/t1413-reflog-detach.sh +13 -13
@@ -1,13 +1,13 @@ #!/bin/sh test_description='Test reflog interaction with detached HEAD' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh reset_state () { - git checkout master && + git checkout main && cp saved_reflog .git/logs/HEAD }
@@ -22,14 +22,14 @@ test_expect_success setup ' test_expect_success baseline ' reset_state && - git rev-parse master master^ >expect && + git rev-parse main main^ >expect && git log -g --format=%H >actual && test_cmp expect actual ' test_expect_success 'switch to branch' ' reset_state && - git rev-parse side master master^ >expect && + git rev-parse side main main^ >expect && git checkout side && git log -g --format=%H >actual && test_cmp expect actual
@@ -37,34 +37,34 @@ test_expect_success 'switch to branch' ' test_expect_success 'detach to other' ' reset_state && - git rev-parse master side master master^ >expect && + git rev-parse main side main main^ >expect && git checkout side && - git checkout master^0 && + git checkout main^0 && git log -g --format=%H >actual && test_cmp expect actual ' test_expect_success 'detach to self' ' reset_state && - git rev-parse master master master^ >expect && - git checkout master^0 && + git rev-parse main main main^ >expect && + git checkout main^0 && git log -g --format=%H >actual && test_cmp expect actual ' test_expect_success 'attach to self' ' reset_state && - git rev-parse master master master master^ >expect && - git checkout master^0 && - git checkout master && + git rev-parse main main main main^ >expect && + git checkout main^0 && + git checkout main && git log -g --format=%H >actual && test_cmp expect actual ' test_expect_success 'attach to other' ' reset_state && - git rev-parse side master master master^ >expect && - git checkout master^0 && + git rev-parse side main main main^ >expect && + git checkout main^0 && git checkout side && git log -g --format=%H >actual && test_cmp expect actual
t/t1414-reflog-walk.sh +7 -7
@@ -1,7 +1,7 @@ #!/bin/sh test_description='various tests of reflog walk (log -g) behavior' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -11,7 +11,7 @@ test_expect_success 'set up some reflog entries' ' test_commit two && git checkout -b side HEAD^ && test_commit three && - git merge --no-commit master && + git merge --no-commit main && echo evil-merge-content >>one.t && test_tick && git commit --no-edit -a
@@ -23,9 +23,9 @@ do_walk () { test_expect_success 'set up expected reflog' ' cat >expect.all <<-EOF - HEAD@{0} commit (merge): Merge branch ${SQ}master${SQ} into side + HEAD@{0} commit (merge): Merge branch ${SQ}main${SQ} into side HEAD@{1} commit: three - HEAD@{2} checkout: moving from master to side + HEAD@{2} checkout: moving from main to side HEAD@{3} commit: two HEAD@{4} commit (initial): one EOF
@@ -76,15 +76,15 @@ test_expect_success 'walking multiple reflogs shows all' ' # sort ignores the bits after the timestamp. # # 2. POSIX leaves undefined whether this is a stable sort or not. So - # we use "-k 1" to ensure that we see HEAD before master before + # we use "-k 1" to ensure that we see HEAD before main before # side when breaking ties. { do_walk --date=unix HEAD && do_walk --date=unix side && - do_walk --date=unix master + do_walk --date=unix main } >expect.raw && sort -t "{" -k 2nr -k 1 <expect.raw >expect && - do_walk --date=unix HEAD master side >actual && + do_walk --date=unix HEAD main side >actual && test_cmp expect actual '
t/t1416-ref-transaction-hooks.sh +6 -6
@@ -2,7 +2,7 @@ test_description='reference transaction hooks' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -56,11 +56,11 @@ test_expect_success 'hook gets all queued updates in prepared state' ' EOF cat >expect <<-EOF && $ZERO_OID $POST_OID HEAD - $ZERO_OID $POST_OID refs/heads/master + $ZERO_OID $POST_OID refs/heads/main EOF git update-ref HEAD POST <<-EOF && update HEAD $ZERO_OID $POST_OID - update refs/heads/master $ZERO_OID $POST_OID + update refs/heads/main $ZERO_OID $POST_OID EOF test_cmp expect actual '
@@ -79,7 +79,7 @@ test_expect_success 'hook gets all queued updates in committed state' ' EOF cat >expect <<-EOF && $ZERO_OID $POST_OID HEAD - $ZERO_OID $POST_OID refs/heads/master + $ZERO_OID $POST_OID refs/heads/main EOF git update-ref HEAD POST && test_cmp expect actual
@@ -99,12 +99,12 @@ test_expect_success 'hook gets all queued updates in aborted state' ' EOF cat >expect <<-EOF && $ZERO_OID $POST_OID HEAD - $ZERO_OID $POST_OID refs/heads/master + $ZERO_OID $POST_OID refs/heads/main EOF git update-ref --stdin <<-EOF && start update HEAD POST $ZERO_OID - update refs/heads/master POST $ZERO_OID + update refs/heads/main POST $ZERO_OID abort EOF test_cmp expect actual
t/t1430-bad-ref-name.sh +27 -27
201 lines not on this page · raw message
t/t1450-fsck.sh +1 -1
@@ -3,7 +3,7 @@ test_description='git fsck random collection of tests * (HEAD) B -* (master) A +* (main) A ' . ./test-lib.sh
t/t1500-rev-parse.sh +3 -3
@@ -1,7 +1,7 @@ #!/bin/sh test_description='test git rev-parse' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -177,8 +177,8 @@ test_expect_success 'showing the superproject correctly' ' test_commit -C super/dir/sub branch1_commit && git -C super add dir/sub && test_commit -C super branch1_commit && - git -C super checkout -b branch2 master && - git -C super/dir/sub checkout -b branch2 master && + git -C super checkout -b branch2 main && + git -C super/dir/sub checkout -b branch2 main && test_commit -C super/dir/sub branch2_commit && git -C super add dir/sub && test_commit -C super branch2_commit &&
t/t1503-rev-parse-verify.sh +15 -15
@@ -6,7 +6,7 @@ test_description='test git rev-parse --verify' exec </dev/null -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -54,8 +54,8 @@ test_expect_success 'works with one good rev' ' test "$rev_hash3" = "$HASH3" && rev_hash4=$(git rev-parse --verify $HASH4) && test "$rev_hash4" = "$HASH4" && - rev_master=$(git rev-parse --verify master) && - test "$rev_master" = "$HASH4" && + rev_main=$(git rev-parse --verify main) && + test "$rev_main" = "$HASH4" && rev_head=$(git rev-parse --verify HEAD) && test "$rev_head" = "$HASH4" '
@@ -119,27 +119,27 @@ test_expect_success 'no stdout output on error' ' ' test_expect_success 'use --default' ' - git rev-parse --verify --default master && - git rev-parse --verify --default master HEAD && - git rev-parse --default master --verify && - git rev-parse --default master --verify HEAD && - git rev-parse --verify HEAD --default master && - test_must_fail git rev-parse --verify foo --default master && + git rev-parse --verify --default main && + git rev-parse --verify --default main HEAD && + git rev-parse --default main --verify && + git rev-parse --default main --verify HEAD && + git rev-parse --verify HEAD --default main && + test_must_fail git rev-parse --verify foo --default main && test_must_fail git rev-parse --default HEAD --verify bar && test_must_fail git rev-parse --verify --default HEAD baz && test_must_fail git rev-parse --default foo --verify && test_must_fail git rev-parse --verify --default bar ' -test_expect_success 'master@{n} for various n' ' +test_expect_success 'main@{n} for various n' ' N=$(git reflog | wc -l) && Nm1=$(($N-1)) && Np1=$(($N+1)) && - git rev-parse --verify master@{0} && - git rev-parse --verify master@{1} && - git rev-parse --verify master@{$Nm1} && - test_must_fail git rev-parse --verify master@{$N} && - test_must_fail git rev-parse --verify master@{$Np1} + git rev-parse --verify main@{0} && + git rev-parse --verify main@{1} && + git rev-parse --verify main@{$Nm1} && + test_must_fail git rev-parse --verify main@{$N} && + test_must_fail git rev-parse --verify main@{$Np1} ' test_expect_success SYMLINKS 'ref resolution not confused by broken symlinks' '
t/t1505-rev-parse-last.sh +5 -5
@@ -2,7 +2,7 @@ test_description='test @{-N} syntax' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -23,12 +23,12 @@ test_expect_success 'setup' ' make_commit 3 && git checkout side && make_commit 4 && - git merge master && - git checkout master + git merge main && + git checkout main ' -# 1 -- 2 -- 3 master +# 1 -- 2 -- 3 main # \ \ # \ \ # --- 4 --- 5 side
@@ -52,7 +52,7 @@ test_expect_success '@{-1}@{1} works' ' ' test_expect_success '@{-2} works' ' - test_cmp_rev master @{-2} + test_cmp_rev main @{-2} ' test_expect_success '@{-3} fails' '
t/t1506-rev-parse-diagnosis.sh +3 -3
@@ -4,7 +4,7 @@ test_description='test git rev-parse diagnosis for invalid argument' exec </dev/null -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -140,10 +140,10 @@ test_expect_success 'incorrect file in :path and :N:path' ' ' test_expect_success 'invalid @{n} reference' ' - test_must_fail git rev-parse master@{99999} >output 2>error && + test_must_fail git rev-parse main@{99999} >output 2>error && test_must_be_empty output && test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error && - test_must_fail git rev-parse --verify master@{99999} >output 2>error && + test_must_fail git rev-parse --verify main@{99999} >output 2>error && test_must_be_empty output && test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error '
t/t1507-rev-parse-upstream.sh +21 -21
128 lines not on this page · raw message
t/t1508-at-combinations.sh +6 -6
@@ -1,7 +1,7 @@ #!/bin/sh test_description='test various @{X} syntax combinations together' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -33,8 +33,8 @@ fail() { } test_expect_success 'setup' ' - test_commit master-one && - test_commit master-two && + test_commit main-one && + test_commit main-two && git checkout -b upstream-branch && test_commit upstream-one && test_commit upstream-two &&
@@ -50,7 +50,7 @@ test_expect_success 'setup' ' git checkout -b new-branch && test_commit new-one && test_commit new-two && - git branch -u master old-branch && + git branch -u main old-branch && git branch -u upstream-branch new-branch '
@@ -65,8 +65,8 @@ check "@{-1}@{1}" commit old-one check "@{u}" ref refs/heads/upstream-branch check "HEAD@{u}" ref refs/heads/upstream-branch check "@{u}@{1}" commit upstream-one -check "@{-1}@{u}" ref refs/heads/master -check "@{-1}@{u}@{1}" commit master-one +check "@{-1}@{u}" ref refs/heads/main +check "@{-1}@{u}@{1}" commit main-one check "@" commit new-two check "@@{u}" ref refs/heads/upstream-branch check "@@/at-test" ref refs/heads/@@/at-test
t/t1511-rev-parse-caret.sh +14 -14
@@ -2,7 +2,7 @@ test_description='tests for ref^{stuff}' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -18,7 +18,7 @@ test_expect_success 'setup' ' git commit -m Initial && git tag -a -m commit commit-tag && git branch ref && - git checkout master && + git checkout main && echo modified >>a-blob && git add -u && git commit -m Modified &&
@@ -76,52 +76,52 @@ test_expect_success 'ref^{tag}' ' ' test_expect_success 'ref^{/.}' ' - git rev-parse master >expected && - git rev-parse master^{/.} >actual && + git rev-parse main >expected && + git rev-parse main^{/.} >actual && test_cmp expected actual ' test_expect_success 'ref^{/non-existent}' ' - test_must_fail git rev-parse master^{/non-existent} + test_must_fail git rev-parse main^{/non-existent} ' test_expect_success 'ref^{/Initial}' ' git rev-parse ref >expected && - git rev-parse master^{/Initial} >actual && + git rev-parse main^{/Initial} >actual && test_cmp expected actual ' test_expect_success 'ref^{/!Exp}' ' - test_must_fail git rev-parse master^{/!Exp} + test_must_fail git rev-parse main^{/!Exp} ' test_expect_success 'ref^{/!}' ' - test_must_fail git rev-parse master^{/!} + test_must_fail git rev-parse main^{/!} ' test_expect_success 'ref^{/!!Exp}' ' git rev-parse expref >expected && - git rev-parse master^{/!!Exp} >actual && + git rev-parse main^{/!!Exp} >actual && test_cmp expected actual ' test_expect_success 'ref^{/!-}' ' - test_must_fail git rev-parse master^{/!-} + test_must_fail git rev-parse main^{/!-} ' test_expect_success 'ref^{/!-.}' ' - test_must_fail git rev-parse master^{/!-.} + test_must_fail git rev-parse main^{/!-.} ' test_expect_success 'ref^{/!-non-existent}' ' - git rev-parse master >expected && - git rev-parse master^{/!-non-existent} >actual && + git rev-parse main >expected && + git rev-parse main^{/!-non-existent} >actual && test_cmp expected actual ' test_expect_success 'ref^{/!-Changed}' ' git rev-parse expref >expected && - git rev-parse master^{/!-Changed} >actual && + git rev-parse main^{/!-Changed} >actual && test_cmp expected actual '
t/t1512-rev-parse-disambiguation.sh +2 -2
@@ -20,7 +20,7 @@ one tagged as v1.0.0. They all have one regular file each. ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -215,7 +215,7 @@ test_expect_success 'more history' ' side=$(git rev-parse HEAD) && # commit 000000000066 - git checkout master && + git checkout main && # If you use recursive, merge will fail and you will need to # clean up a0blgqsjc as well. If you use resolve, merge will
t/t1513-rev-parse-prefix.sh +3 -3
@@ -2,7 +2,7 @@ test_description='Tests for rev-parse --prefix' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -79,9 +79,9 @@ test_expect_success 'disambiguate path with valid prefix' ' ' test_expect_success 'file and refs with prefix' ' - git rev-parse --prefix sub1/ master file1 >actual && + git rev-parse --prefix sub1/ main file1 >actual && cat <<-EOF >expected && - $(git rev-parse master) + $(git rev-parse main) sub1/file1 EOF test_cmp expected actual
t/t1514-rev-parse-push.sh +9 -9
@@ -1,7 +1,7 @@ #!/bin/sh test_description='test <branch>@{push} syntax' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -19,24 +19,24 @@ test_expect_success 'setup' ' git remote add other other.git && test_commit base && git push origin HEAD && - git branch --set-upstream-to=origin/master master && - git branch --track topic origin/master && + git branch --set-upstream-to=origin/main main && + git branch --track topic origin/main && git push origin topic && git push other topic ' test_expect_success '@{push} with default=nothing' ' test_config push.default nothing && - test_must_fail git rev-parse master@{push} && - test_must_fail git rev-parse master@{PUSH} && - test_must_fail git rev-parse master@{PuSH} + test_must_fail git rev-parse main@{push} && + test_must_fail git rev-parse main@{PUSH} && + test_must_fail git rev-parse main@{PuSH} ' test_expect_success '@{push} with default=simple' ' test_config push.default simple && - resolve master@{push} refs/remotes/origin/master && - resolve master@{PUSH} refs/remotes/origin/master && - resolve master@{pUSh} refs/remotes/origin/master + resolve main@{push} refs/remotes/origin/main && + resolve main@{PUSH} refs/remotes/origin/main && + resolve main@{pUSh} refs/remotes/origin/main ' test_expect_success 'triangular @{push} fails with default=simple' '
t/t1700-split-index.sh +2 -2
@@ -2,7 +2,7 @@ test_description='split index mode tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -499,7 +499,7 @@ test_expect_success 'do not refresh null base index' ' test_commit initial && git checkout -b side-branch && test_commit extra && - git checkout master && + git checkout main && git update-index --split-index && test_commit more && # must not write a new shareindex, or we wont catch the problem
Signature · 1 line
gitgitgadget
PATCH v3 4/28 t2*: adjust the references to the default branch name "main"
In reply to Johannes Schindelin via GitGitGadgetFrom: Johannes Schindelin <[email protected]>
Carefully excluding t2106, which sees independent development elsewhere at the time of writing, we transition above-mentioned tests to the default branch name main. This trick was performed via
$ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t2*.sh && git checkout HEAD -- t2106\*)
This allows us to define GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main for those tests.
Signed-off-by Johannes Schindelin <[email protected]>
--- t/t2007-checkout-symlink.sh | 12 +++--- t/t2009-checkout-statinfo.sh | 10 ++--- t/t2010-checkout-ambiguous.sh | 6 +-- t/t2011-checkout-invalid-head.sh | 18 ++++---- t/t2012-checkout-last.sh | 50 +++++++++++------------ t/t2015-checkout-unborn.sh | 4 +- t/t2017-checkout-orphan.sh | 46 ++++++++++----------- t/t2020-checkout-detach.sh | 30 +++++++------- t/t2022-checkout-paths.sh | 24 +++++------ t/t2023-checkout-m.sh | 12 +++--- t/t2024-checkout-dwim.sh | 70 ++++++++++++++++---------------- t/t2027-checkout-track.sh | 8 ++-- t/t2030-unresolve-info.sh | 8 ++-- t/t2060-switch.sh | 32 +++++++-------- t/t2070-restore.sh | 6 +-- t/t2400-worktree-add.sh | 68 +++++++++++++++---------------- t/t2401-worktree-prune.sh | 4 +- t/t2402-worktree-list.sh | 22 +++++----- t/t2405-worktree-submodule.sh | 8 ++-- 19 files changed, 219 insertions(+), 219 deletions(-)
t/t2007-checkout-symlink.sh +6 -6
@@ -4,7 +4,7 @@ test_description='git checkout to switch between branches with symlink<->dir' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -15,14 +15,14 @@ test_expect_success setup ' echo hello >frotz/filfre && git add frotz/filfre && test_tick && - git commit -m "master has file frotz/filfre" && + git commit -m "main has file frotz/filfre" && git branch side && echo goodbye >nitfol && git add nitfol && test_tick && - git commit -m "master adds file nitfol" && + git commit -m "main adds file nitfol" && git checkout side &&
@@ -37,13 +37,13 @@ test_expect_success setup ' test_expect_success 'switch from symlink to dir' ' - git checkout master + git checkout main ' -test_expect_success 'Remove temporary directories & switch to master' ' +test_expect_success 'Remove temporary directories & switch to main' ' rm -fr frotz xyzzy nitfol && - git checkout -f master + git checkout -f main ' test_expect_success 'switch from dir to symlink' '
t/t2009-checkout-statinfo.sh +5 -5
@@ -2,7 +2,7 @@ test_description='checkout should leave clean stat info' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -24,13 +24,13 @@ test_expect_success 'branch switching' ' git reset --hard && test "$(git diff-files --raw)" = "" && - git checkout master && + git checkout main && test "$(git diff-files --raw)" = "" && git checkout side && test "$(git diff-files --raw)" = "" && - git checkout master && + git checkout main && test "$(git diff-files --raw)" = "" '
@@ -40,13 +40,13 @@ test_expect_success 'path checkout' ' git reset --hard && test "$(git diff-files --raw)" = "" && - git checkout master world && + git checkout main world && test "$(git diff-files --raw)" = "" && git checkout side world && test "$(git diff-files --raw)" = "" && - git checkout master world && + git checkout main world && test "$(git diff-files --raw)" = "" '
t/t2010-checkout-ambiguous.sh +3 -3
@@ -2,7 +2,7 @@ test_description='checkout and pathspecs/refspecs ambiguities' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -20,7 +20,7 @@ test_expect_success 'reference must be a tree' ' ' test_expect_success 'branch switching' ' - test "refs/heads/master" = "$(git symbolic-ref HEAD)" && + test "refs/heads/main" = "$(git symbolic-ref HEAD)" && git checkout world -- && test "refs/heads/world" = "$(git symbolic-ref HEAD)" '
@@ -60,7 +60,7 @@ test_expect_success 'disambiguate checking out from a tree-ish' ' ' test_expect_success 'accurate error message with more than one ref' ' - test_must_fail git checkout HEAD master -- 2>actual && + test_must_fail git checkout HEAD main -- 2>actual && test_i18ngrep 2 actual && test_i18ngrep "one reference expected, 2 given" actual '
t/t2011-checkout-invalid-head.sh +9 -9
@@ -2,7 +2,7 @@ test_description='checkout switching away from an invalid branch' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -14,12 +14,12 @@ test_expect_success 'setup' ' ' test_expect_success 'checkout should not start branch from a tree' ' - test_must_fail git checkout -b newbranch master^{tree} + test_must_fail git checkout -b newbranch main^{tree} ' -test_expect_success 'checkout master from invalid HEAD' ' +test_expect_success 'checkout main from invalid HEAD' ' echo $ZERO_OID >.git/HEAD && - git checkout master -- + git checkout main -- ' test_expect_success 'checkout notices failure to lock HEAD' '
@@ -29,7 +29,7 @@ test_expect_success 'checkout notices failure to lock HEAD' ' ' test_expect_success 'create ref directory/file conflict scenario' ' - git update-ref refs/heads/outer/inner master && + git update-ref refs/heads/outer/inner main && # do not rely on symbolic-ref to get a known state, # as it may use the same code we are testing
@@ -40,12 +40,12 @@ test_expect_success 'create ref directory/file conflict scenario' ' test_expect_success 'checkout away from d/f HEAD (unpacked, to branch)' ' reset_to_df && - git checkout master + git checkout main ' test_expect_success 'checkout away from d/f HEAD (unpacked, to detached)' ' reset_to_df && - git checkout --detach master + git checkout --detach main ' test_expect_success 'pack refs' '
@@ -54,11 +54,11 @@ test_expect_success 'pack refs' ' test_expect_success 'checkout away from d/f HEAD (packed, to branch)' ' reset_to_df && - git checkout master + git checkout main ' test_expect_success 'checkout away from d/f HEAD (packed, to detached)' ' reset_to_df && - git checkout --detach master + git checkout --detach main ' test_done
t/t2012-checkout-last.sh +25 -25
95 lines not on this page · raw message
t/t2015-checkout-unborn.sh +2 -2
@@ -1,7 +1,7 @@ #!/bin/sh test_description='checkout from unborn branch' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -14,7 +14,7 @@ test_expect_success 'setup' ' git add file && git commit -m base ) && - git fetch parent master:origin + git fetch parent main:origin ' test_expect_success 'checkout from unborn preserves untracked files' '
t/t2017-checkout-orphan.sh +23 -23
118 lines not on this page · raw message
t/t2020-checkout-detach.sh +15 -15
@@ -1,7 +1,7 @@ #!/bin/sh test_description='checkout into detached HEAD state' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -25,7 +25,7 @@ check_no_orphan_warning() { } reset () { - git checkout master && + git checkout main && check_not_detached }
@@ -88,7 +88,7 @@ test_expect_success 'checkout --detach errors out for non-commit' ' test_expect_success 'checkout --detach errors out for extra argument' ' reset && - git checkout master && + git checkout main && test_must_fail git checkout --detach tag one.t && check_not_detached '
@@ -116,7 +116,7 @@ test_expect_success 'checkout warns on orphan commits' ' echo new content >orphan && git commit -a -m orphan2 && orphan2=$(git rev-parse HEAD) && - git checkout master 2>stderr + git checkout main 2>stderr ' test_expect_success 'checkout warns on orphan commits: output' '
@@ -135,7 +135,7 @@ test_expect_success 'checkout warns orphaning 1 of 2 commits: output' ' test_expect_success 'checkout does not warn leaving ref tip' ' reset && git checkout --detach two && - git checkout master 2>stderr + git checkout main 2>stderr ' test_expect_success 'checkout does not warn leaving ref tip' '
@@ -145,7 +145,7 @@ test_expect_success 'checkout does not warn leaving ref tip' ' test_expect_success 'checkout does not warn leaving reachable commit' ' reset && git checkout --detach HEAD^ && - git checkout master 2>stderr + git checkout main 2>stderr ' test_expect_success 'checkout does not warn leaving reachable commit' '
@@ -153,14 +153,14 @@ test_expect_success 'checkout does not warn leaving reachable commit' ' ' cat >expect <<'EOF' -Your branch is behind 'master' by 1 commit, and can be fast-forwarded. +Your branch is behind 'main' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) EOF test_expect_success 'tracking count is accurate after orphan check' ' reset && - git branch child master^ && + git branch child main^ && git config branch.child.remote . && - git config branch.child.merge refs/heads/master && + git config branch.child.merge refs/heads/main && git checkout child^ && git checkout child >stdout && test_i18ncmp expect stdout
@@ -192,9 +192,9 @@ test_expect_success 'no advice given for explicit detached head state' ' # Detached HEAD tests for GIT_PRINT_SHA1_ELLIPSIS (new format) test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not asked to' " - commit=$(git rev-parse --short=12 master^) && - commit2=$(git rev-parse --short=12 master~2) && - commit3=$(git rev-parse --short=12 master~3) && + commit=$(git rev-parse --short=12 main^) && + commit2=$(git rev-parse --short=12 main~2) && + commit3=$(git rev-parse --short=12 main~3) && # The first detach operation is more chatty than the following ones. cat >1st_detach <<-EOF &&
@@ -274,9 +274,9 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as # Detached HEAD tests for GIT_PRINT_SHA1_ELLIPSIS (old format) test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked to' " - commit=$(git rev-parse --short=12 master^) && - commit2=$(git rev-parse --short=12 master~2) && - commit3=$(git rev-parse --short=12 master~3) && + commit=$(git rev-parse --short=12 main^) && + commit2=$(git rev-parse --short=12 main~2) && + commit3=$(git rev-parse --short=12 main~3) && # The first detach operation is more chatty than the following ones. cat >1st_detach <<-EOF &&
t/t2022-checkout-paths.sh +12 -12
@@ -1,22 +1,22 @@ #!/bin/sh test_description='checkout $tree -- $paths' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh test_expect_success setup ' mkdir dir && - >dir/master && + >dir/main && echo common >dir/common && - git add dir/master dir/common && - test_tick && git commit -m "master has dir/master" && + git add dir/main dir/common && + test_tick && git commit -m "main has dir/main" && git checkout -b next && - git mv dir/master dir/next0 && + git mv dir/main dir/next0 && echo next >dir/next1 && git add dir && - test_tick && git commit -m "next has dir/next but not dir/master" + test_tick && git commit -m "next has dir/next but not dir/main" ' test_expect_success 'checking out paths out of a tree does not clobber unrelated paths' '
@@ -29,11 +29,11 @@ test_expect_success 'checking out paths out of a tree does not clobber unrelated echo untracked >expect.next2 && cat expect.next2 >dir/next2 && - git checkout master dir && + git checkout main dir && test_cmp expect.common dir/common && - test_path_is_file dir/master && - git diff --exit-code master dir/master && + test_path_is_file dir/main && + git diff --exit-code main dir/main && test_path_is_missing dir/next0 && test_cmp expect.next1 dir/next1 &&
@@ -55,11 +55,11 @@ test_expect_success 'do not touch unmerged entries matching $path but not in $tr EOF git update-index --index-info <expect.next0 && - git checkout master dir && + git checkout main dir && test_cmp expect.common dir/common && - test_path_is_file dir/master && - git diff --exit-code master dir/master && + test_path_is_file dir/main && + git diff --exit-code main dir/main && git ls-files -s dir/next0 >actual.next0 && test_cmp expect.next0 actual.next0 '
t/t2023-checkout-m.sh +6 -6
@@ -4,7 +4,7 @@ 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 +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -13,15 +13,15 @@ test_expect_success setup ' test_tick && test_commit both.txt both.txt initial && git branch topic && - test_commit modified_in_master both.txt in_master && - test_commit added_in_master each.txt in_master && + test_commit modified_in_main both.txt in_main && + test_commit added_in_main each.txt in_main && git checkout topic && test_commit modified_in_topic both.txt in_topic && test_commit added_in_topic each.txt in_topic ' -test_expect_success 'git merge master' ' - test_must_fail git merge master +test_expect_success 'git merge main' ' + test_must_fail git merge main ' clean_branchnames () {
@@ -64,7 +64,7 @@ test_expect_success 'force checkout a conflict file creates stage zero entry' ' git checkout topic && echo c >a && C_OBJ=$(git hash-object a) && - git checkout -m master && + git checkout -m main && test_cmp_rev :1:a $A_OBJ && test_cmp_rev :2:a $B_OBJ && test_cmp_rev :3:a $C_OBJ &&
t/t2024-checkout-dwim.sh +35 -35
238 lines not on this page · raw message
t/t2027-checkout-track.sh +4 -4
@@ -2,7 +2,7 @@ test_description='tests for git branch --track' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -13,14 +13,14 @@ test_expect_success 'setup' ' ' test_expect_success 'checkout --track -b creates a new tracking branch' ' - git checkout --track -b branch1 master && + git checkout --track -b branch1 main && test $(git rev-parse --abbrev-ref HEAD) = branch1 && test $(git config --get branch.branch1.remote) = . && - test $(git config --get branch.branch1.merge) = refs/heads/master + test $(git config --get branch.branch1.merge) = refs/heads/main ' test_expect_success 'checkout --track -b rejects an extra path argument' ' - test_must_fail git checkout --track -b branch2 master one.t 2>err && + test_must_fail git checkout --track -b branch2 main one.t 2>err && test_i18ngrep "cannot be used with updating paths" err '
t/t2030-unresolve-info.sh +4 -4
@@ -2,7 +2,7 @@ test_description='undoing resolution' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -62,7 +62,7 @@ test_expect_success setup ' test_commit fourth fi/le fourth && git checkout add-add && test_commit fifth add-differently && - git checkout master + git checkout main ' test_expect_success 'add records switch clears' '
@@ -186,8 +186,8 @@ test_expect_success 'rerere forget (binary)' ' ' test_expect_success 'rerere forget (add-add conflict)' ' - git checkout -f master && - echo master >add-differently && + git checkout -f main && + echo main >add-differently && git add add-differently && git commit -m "add differently" && test_must_fail git merge fifth &&
t/t2060-switch.sh +16 -16
@@ -2,7 +2,7 @@ test_description='switch basic functionality' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -26,41 +26,41 @@ test_expect_success 'switch branch' ' ' test_expect_success 'switch and detach' ' - test_when_finished git switch master && - test_must_fail git switch master^{commit} && - git switch --detach master^{commit} && + test_when_finished git switch main && + test_must_fail git switch main^{commit} && + git switch --detach main^{commit} && test_must_fail git symbolic-ref HEAD ' test_expect_success 'switch and detach current branch' ' - test_when_finished git switch master && - git switch master && + test_when_finished git switch main && + git switch main && git switch --detach && test_must_fail git symbolic-ref HEAD ' test_expect_success 'switch and create branch' ' - test_when_finished git switch master && - git switch -c temp master^ && - test_cmp_rev master^ refs/heads/temp && + test_when_finished git switch main && + git switch -c temp main^ && + test_cmp_rev main^ refs/heads/temp && echo refs/heads/temp >expected-branch && git symbolic-ref HEAD >actual-branch && test_cmp expected-branch actual-branch ' test_expect_success 'force create branch from HEAD' ' - test_when_finished git switch master && - git switch --detach master && + test_when_finished git switch main && + git switch --detach main && test_must_fail git switch -c temp && git switch -C temp && - test_cmp_rev master refs/heads/temp && + test_cmp_rev main refs/heads/temp && echo refs/heads/temp >expected-branch && git symbolic-ref HEAD >actual-branch && test_cmp expected-branch actual-branch ' test_expect_success 'new orphan branch from empty' ' - test_when_finished git switch master && + test_when_finished git switch main && test_must_fail git switch --orphan new-orphan HEAD && git switch --orphan new-orphan && test_commit orphan &&
@@ -72,7 +72,7 @@ test_expect_success 'new orphan branch from empty' ' ' test_expect_success 'orphan branch works with --discard-changes' ' - test_when_finished git switch master && + test_when_finished git switch main && echo foo >foo.txt && git switch --discard-changes --orphan new-orphan2 && git ls-files >tracked-files &&
@@ -80,7 +80,7 @@ test_expect_success 'orphan branch works with --discard-changes' ' ' test_expect_success 'switching ignores file of same branch name' ' - test_when_finished git switch master && + test_when_finished git switch main && : >first-branch && git switch first-branch && echo refs/heads/first-branch >expected &&
@@ -89,7 +89,7 @@ test_expect_success 'switching ignores file of same branch name' ' ' test_expect_success 'guess and create branch' ' - test_when_finished git switch master && + test_when_finished git switch main && test_must_fail git switch --no-guess foo && test_config checkout.guess false && test_must_fail git switch foo &&
t/t2070-restore.sh +3 -3
@@ -2,7 +2,7 @@ test_description='restore basic functionality' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -18,7 +18,7 @@ test_expect_success 'setup' ' echo ignored >ignored && echo /ignored >.gitignore && git add one two .gitignore && - git update-ref refs/heads/one master + git update-ref refs/heads/one main ' test_expect_success 'restore without pathspec is not ok' '
@@ -94,7 +94,7 @@ test_expect_success 'restore --ignore-unmerged ignores unmerged entries' ' git switch -c first && echo first >unmerged && git commit -am first && - git switch -c second master && + git switch -c second main && echo second >unmerged && git commit -am second && test_must_fail git merge first &&
t/t2400-worktree-add.sh +34 -34
226 lines not on this page · raw message
t/t2401-worktree-prune.sh +2 -2
@@ -2,7 +2,7 @@ test_description='prune $GIT_DIR/worktrees' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -90,7 +90,7 @@ test_expect_success 'not prune recent checkouts' ' test_expect_success 'not prune proper checkouts' ' test_when_finished rm -r .git/worktrees && - git worktree add --detach "$PWD/nop" master && + git worktree add --detach "$PWD/nop" main && git worktree prune && test -d .git/worktrees/nop '
t/t2402-worktree-list.sh +11 -11
@@ -2,7 +2,7 @@ test_description='test git worktree list' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -24,7 +24,7 @@ test_expect_success 'rev-parse --git-common-dir on main worktree' ' test_expect_success 'rev-parse --git-path objects linked worktree' ' echo "$(git rev-parse --show-toplevel)/.git/objects" >expect && test_when_finished "rm -rf linked-tree actual expect && git worktree prune" && - git worktree add --detach linked-tree master && + git worktree add --detach linked-tree main && git -C linked-tree rev-parse --git-path objects >actual && test_cmp expect actual '
@@ -32,7 +32,7 @@ test_expect_success 'rev-parse --git-path objects linked worktree' ' test_expect_success '"list" all worktrees from main' ' echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect && test_when_finished "rm -rf here out actual expect && git worktree prune" && - git worktree add --detach here master && + git worktree add --detach here main && echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect && git worktree list >out && sed "s/ */ /g" <out >actual &&
@@ -42,7 +42,7 @@ test_expect_success '"list" all worktrees from main' ' test_expect_success '"list" all worktrees from linked' ' echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect && test_when_finished "rm -rf here out actual expect && git worktree prune" && - git worktree add --detach here master && + git worktree add --detach here main && echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect && git -C here worktree list >out && sed "s/ */ /g" <out >actual &&
@@ -55,7 +55,7 @@ test_expect_success '"list" all worktrees --porcelain' ' echo "branch $(git symbolic-ref HEAD)" >>expect && echo >>expect && test_when_finished "rm -rf here actual expect && git worktree prune" && - git worktree add --detach here master && + git worktree add --detach here main && echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect && echo "HEAD $(git rev-parse HEAD)" >>expect && echo "detached" >>expect &&
@@ -66,8 +66,8 @@ test_expect_success '"list" all worktrees --porcelain' ' test_expect_success '"list" all worktrees with locked annotation' ' test_when_finished "rm -rf locked unlocked out && git worktree prune" && - git worktree add --detach locked master && - git worktree add --detach unlocked master && + git worktree add --detach locked main && + git worktree add --detach unlocked main && git worktree lock locked && git worktree list >out && grep "/locked *[0-9a-f].* locked$" out &&
@@ -79,13 +79,13 @@ test_expect_success 'bare repo setup' ' echo "data" >file1 && git add file1 && git commit -m"File1: add data" && - git push bare1 master && + git push bare1 main && git reset --hard HEAD^ ' test_expect_success '"list" all worktrees from bare main' ' test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" && - git -C bare1 worktree add --detach ../there master && + git -C bare1 worktree add --detach ../there main && echo "$(pwd)/bare1 (bare)" >expect && echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect && git -C bare1 worktree list >out &&
@@ -95,7 +95,7 @@ test_expect_success '"list" all worktrees from bare main' ' test_expect_success '"list" all worktrees --porcelain from bare main' ' test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" && - git -C bare1 worktree add --detach ../there master && + git -C bare1 worktree add --detach ../there main && echo "worktree $(pwd)/bare1" >expect && echo "bare" >>expect && echo >>expect &&
@@ -109,7 +109,7 @@ test_expect_success '"list" all worktrees --porcelain from bare main' ' test_expect_success '"list" all worktrees from linked with a bare main' ' test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" && - git -C bare1 worktree add --detach ../there master && + git -C bare1 worktree add --detach ../there main && echo "$(pwd)/bare1 (bare)" >expect && echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect && git -C there worktree list >out &&
t/t2405-worktree-submodule.sh +4 -4
@@ -2,7 +2,7 @@ test_description='Combination of submodules and multiple worktrees' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -34,7 +34,7 @@ test_expect_success 'add superproject worktree' ' ' test_expect_failure 'submodule is checked out just after worktree add' ' - git -C worktree diff --submodule master"^!" >out && + git -C worktree diff --submodule main"^!" >out && grep "file1 updated" out '
@@ -44,7 +44,7 @@ test_expect_success 'add superproject worktree and initialize submodules' ' ' test_expect_success 'submodule is checked out just after submodule update in linked worktree' ' - git -C worktree-submodule-update diff --submodule master"^!" >out && + git -C worktree-submodule-update diff --submodule main"^!" >out && grep "file1 updated" out '
@@ -54,7 +54,7 @@ test_expect_success 'add superproject worktree and manually add submodule worktr ' test_expect_success 'submodule is checked out after manually adding submodule worktree' ' - git -C linked_submodule diff --submodule master"^!" >out && + git -C linked_submodule diff --submodule main"^!" >out && grep "file1 updated" out '
Signature · 1 line
gitgitgadget
PATCH v3 5/28 t3[0-3]*: adjust the references to the default branch name "main"
In reply to Johannes Schindelin via GitGitGadgetFrom: Johannes Schindelin <[email protected]>
Carefully excluding t3040, which sees independent development elsewhere at the time of writing, we transition above-mentioned tests to the default branch name main. This trick was performed via
$ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t3[0-3]*.sh t3206/* && git checkout HEAD -- t3040\*)
This allows us to define GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main for those tests.
Signed-off-by Johannes Schindelin <[email protected]>
--- t/t3200-branch.sh | 244 +++++++++++++------------- t/t3201-branch-contains.sh | 82 ++++----- t/t3202-show-branch-octopus.sh | 4 +- t/t3203-branch-output.sh | 40 ++--- t/t3204-branch-name-interpretation.sh | 8 +- t/t3205-branch-color.sh | 8 +- t/t3206-range-diff.sh | 42 ++--- t/t3206/history.export | 2 +- t/t3210-pack-refs.sh | 6 +- t/t3211-peel-ref.sh | 6 +- t/t3301-notes.sh | 6 +- t/t3302-notes-index-expensive.sh | 4 +- t/t3303-notes-subtrees.sh | 10 +- t/t3304-notes-mixed.sh | 10 +- t/t3308-notes-merge.sh | 2 +- t/t3320-notes-merge-worktrees.sh | 6 +- 16 files changed, 240 insertions(+), 240 deletions(-)
t/t3200-branch.sh +122 -122
@@ -5,7 +5,7 @@ test_description='git branch assorted tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -31,7 +31,7 @@ test_expect_success 'branch -h in broken repository' ' ( cd broken && git init && - >.git/refs/heads/master && + >.git/refs/heads/main && test_expect_code 129 git branch -h >usage 2>&1 ) && test_i18ngrep "[Uu]sage" broken/usage
@@ -45,8 +45,8 @@ test_expect_success 'git branch a/b/c should create a branch' ' git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c ' -test_expect_success 'git branch mb master... should create a branch' ' - git branch mb master... && test_path_is_file .git/refs/heads/mb +test_expect_success 'git branch mb main... should create a branch' ' + git branch mb main... && test_path_is_file .git/refs/heads/mb ' test_expect_success 'git branch HEAD should fail' '
@@ -54,7 +54,7 @@ test_expect_success 'git branch HEAD should fail' ' ' cat >expect <<EOF -$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master +$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from main EOF test_expect_success 'git branch --create-reflog d/e/f should create a branch and a log' ' GIT_COMMITTER_DATE="2005-05-26 23:30" \
@@ -113,7 +113,7 @@ test_expect_success 'git branch -m n/n n should work' ' test_expect_success 'git branch -m bbb should rename checked out branch' ' test_when_finished git branch -D bbb && - test_when_finished git checkout master && + test_when_finished git checkout main && git checkout -b aaa && git commit --allow-empty -m "a new commit" && git rev-parse aaa@{0} >expect &&
@@ -127,7 +127,7 @@ test_expect_success 'git branch -m bbb should rename checked out branch' ' test_expect_success 'renaming checked out branch works with d/f conflict' ' test_when_finished "git branch -D foo/bar || git branch -D foo" && - test_when_finished git checkout master && + test_when_finished git checkout main && git checkout -b foo && git branch -m foo/bar && git symbolic-ref HEAD >actual &&
@@ -188,7 +188,7 @@ test_expect_success 'git branch -M should leave orphaned HEAD alone' ' git checkout --orphan lonely && grep lonely .git/HEAD && test_path_is_missing .git/refs/head/lonely && - git branch -M master mistress && + git branch -M main mistress && grep lonely .git/HEAD ) '
@@ -204,7 +204,7 @@ test_expect_success 'resulting reflog can be shown by log -g' ' ' test_expect_success 'git branch -M baz bam should succeed when baz is checked out as linked working tree' ' - git checkout master && + git checkout main && git worktree add -b baz bazdir && git worktree add -f bazdir2 baz && git branch -M baz bam &&
@@ -227,18 +227,18 @@ test_expect_success 'git branch -M baz bam should succeed within a worktree in w git worktree prune ' -test_expect_success 'git branch -M master should work when master is checked out' ' - git checkout master && - git branch -M master +test_expect_success 'git branch -M main should work when main is checked out' ' + git checkout main && + git branch -M main ' -test_expect_success 'git branch -M master master should work when master is checked out' ' - git checkout master && - git branch -M master master +test_expect_success 'git branch -M main main should work when main is checked out' ' + git checkout main && + git branch -M main main ' -test_expect_success 'git branch -M topic topic should work when master is checked out' ' - git checkout master && +test_expect_success 'git branch -M topic topic should work when main is checked out' ' + git checkout main && git branch topic && git branch -M topic topic '
@@ -295,8 +295,8 @@ test_expect_success 'bare main worktree has HEAD at branch deleted by secondary git init nonbare && test_commit -C nonbare x && git clone --bare nonbare bare && - git -C bare worktree add --detach ../secondary master && - git -C secondary branch -D master + git -C bare worktree add --detach ../secondary main && + git -C secondary branch -D main ' test_expect_success 'git branch --list -v with --abbrev' '
@@ -348,7 +348,7 @@ test_expect_success 'git branch --column with an extremely long branch name' ' j/k l m/m -* master +* main mb n o/o
@@ -391,7 +391,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch -v with column.ui ignore j/k l m/m -* master +* main mb n o/o
@@ -430,8 +430,8 @@ test_expect_success 'config information was renamed, too' ' ' test_expect_success 'git branch -m correctly renames multiple config sections' ' - test_when_finished "git checkout master" && - git checkout -b source master && + test_when_finished "git checkout main" && + git checkout -b source main && # Assert that a config file with multiple config sections has # those sections preserved...
@@ -590,18 +590,18 @@ test_expect_success 'git branch -C c1 c2 should never touch HEAD' ' ! grep "$msg$" .git/logs/HEAD ' -test_expect_success 'git branch -C master should work when master is checked out' ' - git checkout master && - git branch -C master +test_expect_success 'git branch -C main should work when main is checked out' ' + git checkout main && + git branch -C main ' -test_expect_success 'git branch -C master master should work when master is checked out' ' - git checkout master && - git branch -C master master +test_expect_success 'git branch -C main main should work when main is checked out' ' + git checkout main && + git branch -C main main ' -test_expect_success 'git branch -C main5 main5 should work when master is checked out' ' - git checkout master && +test_expect_success 'git branch -C main5 main5 should work when main is checked out' ' + git checkout main && git branch main5 && git branch -C main5 main5 '
@@ -623,8 +623,8 @@ test_expect_success 'git branch -C ab cd should overwrite existing config for cd test_expect_success 'git branch -c correctly copies multiple config sections' ' FOO=1 && export FOO && - test_when_finished "git checkout master" && - git checkout -b source2 master && + test_when_finished "git checkout main" && + git checkout -b source2 main && # Assert that a config file with multiple config sections has # those sections preserved...
@@ -714,10 +714,10 @@ test_expect_success 'deleting a self-referential symref' ' ' test_expect_success 'renaming a symref is not allowed' ' - git symbolic-ref refs/heads/topic refs/heads/master && + git symbolic-ref refs/heads/topic refs/heads/main && test_must_fail git branch -m topic new-topic && git symbolic-ref refs/heads/topic && - test_path_is_file .git/refs/heads/master && + test_path_is_file .git/refs/heads/main && test_path_is_missing .git/refs/heads/new-topic '
@@ -731,27 +731,27 @@ test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for test_expect_success 'test tracking setup via --track' ' git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --track my1 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --track my1 local/main && test $(git config branch.my1.remote) = local && - test $(git config branch.my1.merge) = refs/heads/master + test $(git config branch.my1.merge) = refs/heads/main ' test_expect_success 'test tracking setup (non-wildcard, matching)' ' git config remote.local.url . && - git config remote.local.fetch refs/heads/master:refs/remotes/local/master && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --track my4 local/master && + git config remote.local.fetch refs/heads/main:refs/remotes/local/main && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --track my4 local/main && test $(git config branch.my4.remote) = local && - test $(git config branch.my4.merge) = refs/heads/master + test $(git config branch.my4.merge) = refs/heads/main ' test_expect_success 'tracking setup fails on non-matching refspec' ' git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && + (git show-ref -q refs/remotes/local/main || git fetch local) && git config remote.local.fetch refs/heads/s:refs/remotes/local/s && - test_must_fail git branch --track my5 local/master && + test_must_fail git branch --track my5 local/main && test_must_fail git config branch.my5.remote && test_must_fail git config branch.my5.merge '
@@ -760,21 +760,21 @@ test_expect_success 'test tracking setup via config' ' git config branch.autosetupmerge true && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch my3 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch my3 local/main && test $(git config branch.my3.remote) = local && - test $(git config branch.my3.merge) = refs/heads/master + test $(git config branch.my3.merge) = refs/heads/main ' test_expect_success 'test overriding tracking setup via --no-track' ' git config branch.autosetupmerge true && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --no-track my2 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --no-track my2 local/main && git config branch.autosetupmerge false && ! test "$(git config branch.my2.remote)" = local && - ! test "$(git config branch.my2.merge)" = refs/heads/master + ! test "$(git config branch.my2.merge)" = refs/heads/main ' test_expect_success 'no tracking without .fetch entries' '
@@ -839,26 +839,26 @@ test_expect_success 'branch from tag w/--track causes failure' ' test_expect_success '--set-upstream-to fails on multiple branches' ' echo "fatal: too many arguments to set new upstream" >expect && - test_must_fail git branch --set-upstream-to master a b c 2>err && + test_must_fail git branch --set-upstream-to main a b c 2>err && test_i18ncmp expect err ' test_expect_success '--set-upstream-to fails on detached HEAD' ' git checkout HEAD^{} && test_when_finished git checkout - && - echo "fatal: could not set upstream of HEAD to master when it does not point to any branch." >expect && - test_must_fail git branch --set-upstream-to master 2>err && + echo "fatal: could not set upstream of HEAD to main when it does not point to any branch." >expect && + test_must_fail git branch --set-upstream-to main 2>err && test_i18ncmp expect err ' test_expect_success '--set-upstream-to fails on a missing dst branch' ' echo "fatal: branch '"'"'does-not-exist'"'"' does not exist" >expect && - test_must_fail git branch --set-upstream-to master does-not-exist 2>err && + test_must_fail git branch --set-upstream-to main does-not-exist 2>err && test_i18ncmp expect err ' test_expect_success '--set-upstream-to fails on a missing src branch' ' - test_must_fail git branch --set-upstream-to does-not-exist master 2>err && + test_must_fail git branch --set-upstream-to does-not-exist main 2>err && test_i18ngrep "the requested upstream branch '"'"'does-not-exist'"'"' does not exist" err '
@@ -877,20 +877,20 @@ test_expect_success '--set-upstream-to fails on locked config' ' ' test_expect_success 'use --set-upstream-to modify HEAD' ' - test_config branch.master.remote foo && - test_config branch.master.merge foo && + test_config branch.main.remote foo && + test_config branch.main.merge foo && git branch my12 && git branch --set-upstream-to my12 && - test "$(git config branch.master.remote)" = "." && - test "$(git config branch.master.merge)" = "refs/heads/my12" + test "$(git config branch.main.remote)" = "." && + test "$(git config branch.main.merge)" = "refs/heads/my12" ' test_expect_success 'use --set-upstream-to modify a particular branch' ' git branch my13 && - git branch --set-upstream-to master my13 && + git branch --set-upstream-to main my13 && test_when_finished "git branch --unset-upstream my13" && test "$(git config branch.my13.remote)" = "." && - test "$(git config branch.my13.merge)" = "refs/heads/master" + test "$(git config branch.my13.merge)" = "refs/heads/main" ' test_expect_success '--unset-upstream should fail if given a non-existent branch' '
@@ -909,14 +909,14 @@ test_expect_success '--unset-upstream should fail if config is locked' ' test_expect_success 'test --unset-upstream on HEAD' ' git branch my14 && - test_config branch.master.remote foo && - test_config branch.master.merge foo && + test_config branch.main.remote foo && + test_config branch.main.merge foo && git branch --set-upstream-to my14 && git branch --unset-upstream && - test_must_fail git config branch.master.remote && - test_must_fail git config branch.master.merge && + test_must_fail git config branch.main.remote && + test_must_fail git config branch.main.merge && # fail for a branch without upstream set - echo "fatal: Branch '"'"'master'"'"' has no upstream information" >expect && + echo "fatal: Branch '"'"'main'"'"' has no upstream information" >expect && test_must_fail git branch --unset-upstream 2>err && test_i18ncmp expect err '
@@ -937,14 +937,14 @@ test_expect_success '--unset-upstream should fail on detached HEAD' ' test_expect_success 'test --unset-upstream on a particular branch' ' git branch my15 && - git branch --set-upstream-to master my14 && + git branch --set-upstream-to main my14 && git branch --unset-upstream my14 && test_must_fail git config branch.my14.remote && test_must_fail git config branch.my14.merge ' test_expect_success 'disabled option --set-upstream fails' ' - test_must_fail git branch --set-upstream origin/master + test_must_fail git branch --set-upstream origin/main ' test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
@@ -959,32 +959,32 @@ test_expect_success '--set-upstream-to notices an error to set branch as own ups # Keep this test last, as it changes the current branch cat >expect <<EOF -$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master +$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from main EOF test_expect_success 'git checkout -b g/h/i -l should create a branch and a log' ' GIT_COMMITTER_DATE="2005-05-26 23:30" \ - git checkout -b g/h/i -l master && + git checkout -b g/h/i -l main && test_path_is_file .git/refs/heads/g/h/i && test_path_is_file .git/logs/refs/heads/g/h/i && test_cmp expect .git/logs/refs/heads/g/h/i ' test_expect_success 'checkout -b makes reflog by default' ' - git checkout master && + git checkout main && git config --unset core.logAllRefUpdates && git checkout -b alpha && git rev-parse --verify alpha@{0} ' test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates = false' ' - git checkout master && + git checkout main && git config core.logAllRefUpdates false && git checkout -b beta && test_must_fail git rev-parse --verify beta@{0} ' test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' ' - git checkout master && + git checkout main && git checkout -lb gamma && git config --unset core.logAllRefUpdates && git rev-parse --verify gamma@{0}
@@ -993,10 +993,10 @@ test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates test_expect_success 'avoid ambiguous track' ' git config branch.autosetupmerge true && git config remote.ambi1.url lalala && - git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master && + git config remote.ambi1.fetch refs/heads/lalala:refs/heads/main && git config remote.ambi2.url lilili && - git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master && - test_must_fail git branch all1 master && + git config remote.ambi2.fetch refs/heads/lilili:refs/heads/main && + test_must_fail git branch all1 main && test -z "$(git config branch.all1.merge)" '
@@ -1052,10 +1052,10 @@ test_expect_success 'autosetuprebase local on a tracked remote branch' ' git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && git config branch.autosetuprebase local && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --track myr5 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --track myr5 local/main && test "$(git config branch.myr5.remote)" = local && - test "$(git config branch.myr5.merge)" = refs/heads/master && + test "$(git config branch.myr5.merge)" = refs/heads/main && ! test "$(git config branch.myr5.rebase)" = true '
@@ -1063,10 +1063,10 @@ test_expect_success 'autosetuprebase never on a tracked remote branch' ' git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && git config branch.autosetuprebase never && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --track myr6 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --track myr6 local/main && test "$(git config branch.myr6.remote)" = local && - test "$(git config branch.myr6.merge)" = refs/heads/master && + test "$(git config branch.myr6.merge)" = refs/heads/main && ! test "$(git config branch.myr6.rebase)" = true '
@@ -1074,10 +1074,10 @@ test_expect_success 'autosetuprebase remote on a tracked remote branch' ' git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && git config branch.autosetuprebase remote && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --track myr7 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --track myr7 local/main && test "$(git config branch.myr7.remote)" = local && - test "$(git config branch.myr7.merge)" = refs/heads/master && + test "$(git config branch.myr7.merge)" = refs/heads/main && test "$(git config branch.myr7.rebase)" = true '
@@ -1085,10 +1085,10 @@ test_expect_success 'autosetuprebase always on a tracked remote branch' ' git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && git config branch.autosetuprebase remote && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --track myr8 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --track myr8 local/main && test "$(git config branch.myr8.remote)" = local && - test "$(git config branch.myr8.merge)" = refs/heads/master && + test "$(git config branch.myr8.merge)" = refs/heads/main && test "$(git config branch.myr8.rebase)" = true '
@@ -1096,10 +1096,10 @@ test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' ' git config --unset branch.autosetuprebase && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --track myr9 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --track myr9 local/main && test "$(git config branch.myr9.remote)" = local && - test "$(git config branch.myr9.merge)" = refs/heads/master && + test "$(git config branch.myr9.merge)" = refs/heads/main && test "z$(git config branch.myr9.rebase)" = z '
@@ -1117,7 +1117,7 @@ test_expect_success 'autosetuprebase unconfigured on a tracked local branch' ' test_expect_success 'autosetuprebase unconfigured on untracked local branch' ' git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && + (git show-ref -q refs/remotes/local/main || git fetch local) && git branch --no-track myr11 mybase2 && test "z$(git config branch.myr11.remote)" = z && test "z$(git config branch.myr11.merge)" = z &&
@@ -1127,8 +1127,8 @@ test_expect_success 'autosetuprebase unconfigured on untracked local branch' ' test_expect_success 'autosetuprebase unconfigured on untracked remote branch' ' git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --no-track myr12 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --no-track myr12 local/main && test "z$(git config branch.myr12.remote)" = z && test "z$(git config branch.myr12.merge)" = z && test "z$(git config branch.myr12.rebase)" = z
@@ -1138,7 +1138,7 @@ test_expect_success 'autosetuprebase never on an untracked local branch' ' git config branch.autosetuprebase never && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && + (git show-ref -q refs/remotes/local/main || git fetch local) && git branch --no-track myr13 mybase2 && test "z$(git config branch.myr13.remote)" = z && test "z$(git config branch.myr13.merge)" = z &&
@@ -1149,7 +1149,7 @@ test_expect_success 'autosetuprebase local on an untracked local branch' ' git config branch.autosetuprebase local && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && + (git show-ref -q refs/remotes/local/main || git fetch local) && git branch --no-track myr14 mybase2 && test "z$(git config branch.myr14.remote)" = z && test "z$(git config branch.myr14.merge)" = z &&
@@ -1160,7 +1160,7 @@ test_expect_success 'autosetuprebase remote on an untracked local branch' ' git config branch.autosetuprebase remote && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && + (git show-ref -q refs/remotes/local/main || git fetch local) && git branch --no-track myr15 mybase2 && test "z$(git config branch.myr15.remote)" = z && test "z$(git config branch.myr15.merge)" = z &&
@@ -1171,7 +1171,7 @@ test_expect_success 'autosetuprebase always on an untracked local branch' ' git config branch.autosetuprebase always && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && + (git show-ref -q refs/remotes/local/main || git fetch local) && git branch --no-track myr16 mybase2 && test "z$(git config branch.myr16.remote)" = z && test "z$(git config branch.myr16.merge)" = z &&
@@ -1182,8 +1182,8 @@ test_expect_success 'autosetuprebase never on an untracked remote branch' ' git config branch.autosetuprebase never && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --no-track myr17 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --no-track myr17 local/main && test "z$(git config branch.myr17.remote)" = z && test "z$(git config branch.myr17.merge)" = z && test "z$(git config branch.myr17.rebase)" = z
@@ -1193,8 +1193,8 @@ test_expect_success 'autosetuprebase local on an untracked remote branch' ' git config branch.autosetuprebase local && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --no-track myr18 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --no-track myr18 local/main && test "z$(git config branch.myr18.remote)" = z && test "z$(git config branch.myr18.merge)" = z && test "z$(git config branch.myr18.rebase)" = z
@@ -1204,8 +1204,8 @@ test_expect_success 'autosetuprebase remote on an untracked remote branch' ' git config branch.autosetuprebase remote && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --no-track myr19 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --no-track myr19 local/main && test "z$(git config branch.myr19.remote)" = z && test "z$(git config branch.myr19.merge)" = z && test "z$(git config branch.myr19.rebase)" = z
@@ -1215,8 +1215,8 @@ test_expect_success 'autosetuprebase always on an untracked remote branch' ' git config branch.autosetuprebase always && git config remote.local.url . && git config remote.local.fetch refs/heads/*:refs/remotes/local/* && - (git show-ref -q refs/remotes/local/master || git fetch local) && - git branch --no-track myr20 local/master && + (git show-ref -q refs/remotes/local/main || git fetch local) && + git branch --no-track myr20 local/main && test "z$(git config branch.myr20.remote)" = z && test "z$(git config branch.myr20.merge)" = z && test "z$(git config branch.myr20.rebase)" = z
@@ -1224,7 +1224,7 @@ test_expect_success 'autosetuprebase always on an untracked remote branch' ' test_expect_success 'autosetuprebase always on detached HEAD' ' git config branch.autosetupmerge always && - test_when_finished git checkout master && + test_when_finished git checkout main && git checkout HEAD^0 && git branch my11 && test -z "$(git config branch.my11.remote)" &&
@@ -1252,18 +1252,18 @@ test_expect_success 'attempt to delete a branch without base and unmerged to HEA test_expect_success 'attempt to delete a branch merged to its base' ' # we are on my9 which is the initial commit; traditionally # we would not have allowed deleting my8 that is not merged - # to my9, but it is set to track master that already has my8 - git config branch.my8.merge refs/heads/master && + # to my9, but it is set to track main that already has my8 + git config branch.my8.merge refs/heads/main && git branch -d my8 ' test_expect_success 'attempt to delete a branch merged to its base' ' - git checkout master && + git checkout main && echo Third >>A && git commit -m "Third commit" A && git branch -t my10 my9 && git branch -f my10 HEAD^ && - # we are on master which is at the third commit, and my10 + # we are on main which is at the third commit, and my10 # is behind us, so traditionally we would have allowed deleting # it; but my10 is set to track my9 that is further behind. test_must_fail git branch -d my10
@@ -1290,7 +1290,7 @@ test_expect_success 'detect typo in branch name when using --edit-description' ' ' test_expect_success 'refuse --edit-description on unborn branch for now' ' - test_when_finished "git checkout master" && + test_when_finished "git checkout main" && write_script editor <<-\EOF && echo "New contents" >"$1" EOF
@@ -1304,18 +1304,18 @@ test_expect_success '--merged catches invalid object names' ' test_expect_success '--list during rebase' ' test_when_finished "reset_rebase" && - git checkout master && + git checkout main && FAKE_LINES="1 edit 2" && export FAKE_LINES && set_fake_editor && git rebase -i HEAD~2 && git branch --list >actual && - test_i18ngrep "rebasing master" actual + test_i18ngrep "rebasing main" actual ' test_expect_success '--list during rebase from detached HEAD' ' - test_when_finished "reset_rebase && git checkout master" && - git checkout master^0 && + test_when_finished "reset_rebase && git checkout main" && + git checkout main^0 && oid=$(git rev-parse --short HEAD) && FAKE_LINES="1 edit 2" && export FAKE_LINES &&
@@ -1351,11 +1351,11 @@ test_expect_success 'tracking with unexpected .fetch refspec' ' git remote add c ../c && git config remote.c.fetch "+refs/remotes/*:refs/remotes/*" && git fetch c && - git branch --track local/a/master remotes/a/master && - test "$(git config branch.local/a/master.remote)" = "c" && - test "$(git config branch.local/a/master.merge)" = "refs/remotes/a/master" && + git branch --track local/a/main remotes/a/main && + test "$(git config branch.local/a/main.remote)" = "c" && + test "$(git config branch.local/a/main.merge)" = "refs/remotes/a/main" && git rev-parse --verify a >expect && - git rev-parse --verify local/a/master >actual && + git rev-parse --verify local/a/main >actual && test_cmp expect actual ) '
@@ -1374,7 +1374,7 @@ test_expect_success 'configured committerdate sort' ' test_commit b && git branch >actual && cat >expect <<-\EOF && - master + main a c * b
@@ -1392,7 +1392,7 @@ test_expect_success 'option override configured sort' ' a * b c - master + main EOF test_cmp expect actual )
t/t3201-branch-contains.sh +41 -41
231 lines not on this page · raw message
t/t3202-show-branch-octopus.sh +2 -2
@@ -2,7 +2,7 @@ test_description='test show-branch with more than 8 heads' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -18,7 +18,7 @@ test_expect_success 'setup' ' for i in $numbers do - git checkout -b branch$i master && + git checkout -b branch$i main && > file$i && git add file$i && test_tick &&
t/t3203-branch-output.sh +20 -20
@@ -1,7 +1,7 @@ #!/bin/sh test_description='git branch display tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -29,7 +29,7 @@ test_expect_success 'make remote branches' ' cat >expect <<'EOF' branch-one branch-two -* master +* main EOF test_expect_success 'git branch shows local branches' ' git branch >actual &&
@@ -63,7 +63,7 @@ test_expect_success 'git branch -r shows remote branches' ' cat >expect <<'EOF' branch-one branch-two -* master +* main remotes/origin/HEAD -> origin/branch-one remotes/origin/branch-one remotes/origin/branch-two
@@ -155,7 +155,7 @@ test_expect_success 'git branch shows detached HEAD properly' ' * (HEAD detached at $(git rev-parse --short HEAD^0)) branch-one branch-two - master + main EOF git checkout HEAD^0 && git branch >actual &&
@@ -163,12 +163,12 @@ EOF ' test_expect_success 'git branch shows detached HEAD properly after checkout --detach' ' - git checkout master && + git checkout main && cat >expect <<EOF && * (HEAD detached at $(git rev-parse --short HEAD^0)) branch-one branch-two - master + main EOF git checkout --detach && git branch >actual &&
@@ -180,7 +180,7 @@ test_expect_success 'git branch shows detached HEAD properly after moving' ' * (HEAD detached from $(git rev-parse --short HEAD)) branch-one branch-two - master + main EOF git reset --hard HEAD^1 && git branch >actual &&
@@ -192,9 +192,9 @@ test_expect_success 'git branch shows detached HEAD properly from tag' ' * (HEAD detached at fromtag) branch-one branch-two - master + main EOF - git tag fromtag master && + git tag fromtag main && git checkout fromtag && git branch >actual && test_i18ncmp expect actual
@@ -205,7 +205,7 @@ test_expect_success 'git branch shows detached HEAD properly after moving from t * (HEAD detached from fromtag) branch-one branch-two - master + main EOF git reset --hard HEAD^1 && git branch >actual &&
@@ -217,7 +217,7 @@ test_expect_success 'git branch `--sort` option' ' * (HEAD detached from fromtag) branch-two branch-one - master + main EOF git branch --sort=objectsize >actual && test_i18ncmp expect actual
@@ -226,7 +226,7 @@ test_expect_success 'git branch `--sort` option' ' test_expect_success 'git branch --points-at option' ' cat >expect <<-\EOF && branch-one - master + main EOF git branch --points-at=branch-one >actual && test_cmp expect actual
@@ -263,14 +263,14 @@ test_expect_success 'sort branches, ignore case' ' cat >expected <<-\EOF && BRANCH-two branch-one - master + main EOF test_cmp expected actual && git branch --list -i | awk "{print \$NF}" >actual && cat >expected <<-\EOF && branch-one BRANCH-two - master + main EOF test_cmp expected actual )
@@ -282,7 +282,7 @@ test_expect_success 'git branch --format option' ' Refname is refs/heads/ambiguous Refname is refs/heads/branch-one Refname is refs/heads/branch-two - Refname is refs/heads/master + Refname is refs/heads/main Refname is refs/heads/ref-to-branch Refname is refs/heads/ref-to-remote EOF
@@ -296,7 +296,7 @@ test_expect_success 'worktree colors correct' ' ambiguous<RESET> branch-one<RESET> + <CYAN>branch-two<RESET> - master<RESET> + main<RESET> ref-to-branch<RESET> -> branch-one ref-to-remote<RESET> -> origin/branch-one EOF
@@ -309,9 +309,9 @@ test_expect_success 'worktree colors correct' ' ' test_expect_success "set up color tests" ' - echo "<RED>master<RESET>" >expect.color && - echo "master" >expect.bare && - color_args="--format=%(color:red)%(refname:short) --list master" + echo "<RED>main<RESET>" >expect.color && + echo "main" >expect.bare && + color_args="--format=%(color:red)%(refname:short) --list main" ' test_expect_success '%(color) omitted without tty' '
@@ -334,7 +334,7 @@ test_expect_success '--color overrides auto-color' ' test_expect_success PREPARE_FOR_MAIN_BRANCH 'verbose output lists worktree path' ' one=$(git rev-parse --short HEAD) && - two=$(git rev-parse --short master) && + two=$(git rev-parse --short main) && cat >expect <<-EOF && * (HEAD detached from fromtag) $one one ambiguous $one one
t/t3204-branch-name-interpretation.sh +4 -4
@@ -6,7 +6,7 @@ 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 +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -31,7 +31,7 @@ test_expect_success 'update branch via @{-1}' ' git branch previous one && git checkout previous && - git checkout master && + git checkout main && git branch -f @{-1} two && expect_branch previous two
@@ -61,7 +61,7 @@ test_expect_success 'delete branch via @{-1}' ' git branch previous-del && git checkout previous-del && - git checkout master && + git checkout main && git branch -D @{-1} && expect_deleted previous-del
@@ -101,7 +101,7 @@ test_expect_success 'disallow deleting remote branch via @{-1}' ' git update-ref refs/remotes/origin/previous one && git checkout -b origin/previous two && - git checkout master && + git checkout main && test_must_fail git branch -r -D @{-1} && expect_branch refs/remotes/origin/previous one &&
t/t3205-branch-color.sh +4 -4
@@ -1,14 +1,14 @@ #!/bin/sh test_description='basic branch output coloring' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh test_expect_success 'set up some sample branches' ' test_commit foo && - git update-ref refs/remotes/origin/master HEAD && + git update-ref refs/remotes/origin/main HEAD && git update-ref refs/heads/other HEAD '
@@ -22,9 +22,9 @@ test_expect_success 'set up some color config' ' test_expect_success 'regular output shows colors' ' cat >expect <<-\EOF && - * <CYAN>master<RESET> + * <CYAN>main<RESET> <BLUE>other<RESET> - <YELLOW>remotes/origin/master<RESET> + <YELLOW>remotes/origin/main<RESET> EOF git branch --color -a >actual.raw && test_decode_color <actual.raw >actual &&
t/t3206-range-diff.sh +21 -21
162 lines not on this page · raw message
t/t3206/history.export +1 -1
@@ -168,7 +168,7 @@ mark :11 data 10 unrelated -commit refs/heads/master +commit refs/heads/main mark :12 author Thomas Rast <[email protected]> 1374485127 +0200 committer Thomas Rast <[email protected]> 1374485127 +0200
t/t3210-pack-refs.sh +3 -3
@@ -9,7 +9,7 @@ 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 +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -138,7 +138,7 @@ test_expect_success 'delete ref with dangling packed version' ' git commit --allow-empty -m "future garbage" && git pack-refs --all && git reset --hard HEAD^ && - git checkout master && + git checkout main && git reflog expire --expire=all --all && git prune --expire=all && git branch -d lamb 2>result &&
@@ -243,7 +243,7 @@ test_expect_success 'retry acquiring packed-refs.lock' ' test_expect_success SYMLINKS 'pack symlinked packed-refs' ' # First make sure that symlinking works when reading: - git update-ref refs/heads/lossy refs/heads/master && + git update-ref refs/heads/lossy refs/heads/main && git for-each-ref >all-refs-before && mv .git/packed-refs .git/my-deviant-packed-refs && ln -s my-deviant-packed-refs .git/packed-refs &&
t/t3211-peel-ref.sh +3 -3
@@ -1,7 +1,7 @@ #!/bin/sh test_description='tests for the peel_ref optimization of packed-refs' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -22,7 +22,7 @@ print_ref() { test_expect_success 'set up expected show-ref output' ' { - print_ref "refs/heads/master" && + print_ref "refs/heads/main" && print_ref "refs/outside/foo" && print_ref "refs/outside/foo^{}" && print_ref "refs/tags/base" &&
@@ -50,7 +50,7 @@ test_expect_success 'create old-style pack-refs without fully-peeled' ' # know we are emulating exactly what an older git would have written. { echo "# pack-refs with: peeled " && - print_ref "refs/heads/master" && + print_ref "refs/heads/main" && print_ref "refs/outside/foo" && print_ref "refs/tags/base" && print_ref "refs/tags/foo" &&
t/t3301-notes.sh +3 -3
@@ -1295,11 +1295,11 @@ test_expect_success 'git notes copy diagnoses too many or too few parameters' ' test_i18ngrep "too many parameters" error ' -test_expect_success 'git notes get-ref expands refs/heads/master to refs/notes/refs/heads/master' ' +test_expect_success 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main' ' test_unconfig core.notesRef && sane_unset GIT_NOTES_REF && - echo refs/notes/refs/heads/master >expect && - git notes --ref=refs/heads/master get-ref >actual && + echo refs/notes/refs/heads/main >expect && + git notes --ref=refs/heads/main get-ref >actual && test_cmp expect actual '
t/t3302-notes-index-expensive.sh +2 -2
@@ -5,7 +5,7 @@ test_description='Test commit notes index (expensive!)' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -23,7 +23,7 @@ create_repo () { notemark=$(($mark+1)) test_tick && cat <<-INPUT_END && - commit refs/heads/master + commit refs/heads/main mark :$mark committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE data <<COMMIT
t/t3303-notes-subtrees.sh +5 -5
@@ -2,7 +2,7 @@ test_description='Test commit notes organized in subtrees' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -43,7 +43,7 @@ test_expect_success "setup: create $number_of_commits commits" ' nr=$(($nr+1)) && test_tick && cat <<INPUT_END -commit refs/heads/master +commit refs/heads/main committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE data <<COMMIT commit #$nr
@@ -78,7 +78,7 @@ test_sha1_based () { ( start_note_commit && nr=$number_of_commits && - git rev-list refs/heads/master | + git rev-list refs/heads/main | while read sha1; do note_path=$(echo "$sha1" | sed "$1") cat <<INPUT_END &&
@@ -108,7 +108,7 @@ test_same_notes () { ( start_note_commit && nr=$number_of_commits && - git rev-list refs/heads/master | + git rev-list refs/heads/main | while read sha1; do first_note_path=$(echo "$sha1" | sed "$1") second_note_path=$(echo "$sha1" | sed "$2")
@@ -147,7 +147,7 @@ test_concatenated_notes () { ( start_note_commit && nr=$number_of_commits && - git rev-list refs/heads/master | + git rev-list refs/heads/main | while read sha1; do first_note_path=$(echo "$sha1" | sed "$1") second_note_path=$(echo "$sha1" | sed "$2")
t/t3304-notes-mixed.sh +5 -5
@@ -2,7 +2,7 @@ test_description='Test notes trees that also contain non-notes' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -39,7 +39,7 @@ test_expect_success "setup: create a couple of commits" ' test_tick && cat <<INPUT_END >input && -commit refs/heads/master +commit refs/heads/main committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE data <<COMMIT commit #1
@@ -54,7 +54,7 @@ INPUT_END test_tick && cat <<INPUT_END >>input && -commit refs/heads/master +commit refs/heads/main committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE data <<COMMIT commit #2
@@ -71,8 +71,8 @@ INPUT_END test_expect_success "create a notes tree with both notes and non-notes" ' - commit1=$(git rev-parse refs/heads/master^) && - commit2=$(git rev-parse refs/heads/master) && + commit1=$(git rev-parse refs/heads/main^) && + commit2=$(git rev-parse refs/heads/main) && test_tick && cat <<INPUT_END >input && commit refs/notes/commits
t/t3308-notes-merge.sh +1 -1
@@ -108,7 +108,7 @@ test_expect_success 'fail to merge into various non-notes refs' ' git update-ref refs/notes/dir/foo HEAD && test_must_fail git -c "core.notesRef=refs/notes/dir" notes merge x && test_must_fail git -c "core.notesRef=refs/notes/dir/" notes merge x && - test_must_fail git -c "core.notesRef=refs/heads/master" notes merge x && + test_must_fail git -c "core.notesRef=refs/heads/main" notes merge x && test_must_fail git -c "core.notesRef=refs/notes/y:" notes merge x && test_must_fail git -c "core.notesRef=refs/notes/y:foo" notes merge x && test_must_fail git -c "core.notesRef=refs/notes/foo^{bar" notes merge x
t/t3320-notes-merge-worktrees.sh +3 -3
@@ -5,7 +5,7 @@ test_description='Test merging of notes trees in multiple worktrees' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -39,8 +39,8 @@ test_expect_success 'modify notes ref ourselves (x)' ' ' test_expect_success 'create some new worktrees' ' - git worktree add -b newbranch worktree master && - git worktree add -b newbranch2 worktree2 master + git worktree add -b newbranch worktree main && + git worktree add -b newbranch2 worktree2 main ' test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' '
Signature · 1 line
gitgitgadget
PATCH v3 6/28 t3416: preemptively adjust alignment in a comment
In reply to Johannes Schindelin via GitGitGadgetFrom: Johannes Schindelin <[email protected]>
We are about to adjust t3416 for the new default branch name main. This name is two characters shorter and therefore needs two spaces more padding to align correctly.
Adjusting the alignment before the big search-and-replace makes it easier to verify that the final result does not leave any misaligned lines behind.
Signed-off-by Johannes Schindelin <[email protected]>
--- t/t3416-rebase-onto-threedots.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
t/t3416-rebase-onto-threedots.sh +1 -1
@@ -15,7 +15,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME # # F---G topic G' # / / -# A---B---C---D---E master --> A---B---C---D---E +# A---B---C---D---E master --> A---B---C---D---E # \ \ / # \ x # \ / \
Signature · 1 line
gitgitgadget
PATCH v3 7/28 t34*: adjust the references to the default branch name "main"
In reply to Johannes Schindelin via GitGitGadgetFrom: Johannes Schindelin <[email protected]>
Carefully excluding t3404, which sees independent development elsewhere at the time of writing, we use main as the default branch name in t34*. This trick was performed via
$ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t34*.sh && git checkout HEAD -- t34\*)
This allows us to define GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main for those tests.
Signed-off-by Johannes Schindelin <[email protected]>
--- t/t3400-rebase.sh | 62 +++++++++++++++---------------- t/t3402-rebase-merge.sh | 46 +++++++++++------------ t/t3403-rebase-skip.sh | 8 ++-- t/t3405-rebase-malformed.sh | 10 ++--- t/t3406-rebase-message.sh | 26 ++++++------- t/t3407-rebase-abort.sh | 20 +++++----- t/t3408-rebase-multi-line.sh | 4 +- t/t3409-rebase-preserve-merges.sh | 12 +++--- t/t3412-rebase-root.sh | 30 +++++++-------- t/t3413-rebase-hook.sh | 44 +++++++++++----------- t/t3415-rebase-autosquash.sh | 4 +- t/t3416-rebase-onto-threedots.sh | 56 ++++++++++++++-------------- t/t3418-rebase-continue.sh | 26 ++++++------- t/t3419-rebase-patch-id.sh | 14 +++---- t/t3420-rebase-autostash.sh | 10 ++--- t/t3423-rebase-reword.sh | 6 +-- t/t3427-rebase-subtree.sh | 22 +++++------ t/t3430-rebase-merges.sh | 18 ++++----- t/t3431-rebase-fork-point.sh | 34 ++++++++--------- t/t3432-rebase-fast-forward.sh | 36 +++++++++--------- t/t3434-rebase-i18n.sh | 10 ++--- t/t3435-rebase-gpg-sign.sh | 6 +-- t/t3436-rebase-more-options.sh | 2 +- 23 files changed, 253 insertions(+), 253 deletions(-)
t/t3400-rebase.sh +31 -31
@@ -8,7 +8,7 @@ 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 +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -27,15 +27,15 @@ test_expect_success 'prepare repository with topic branches' ' git update-index --add Y && git commit -m "Add Y." && git checkout -b filemove && - git reset --soft master && + git reset --soft main && mkdir D && git mv A D/A && git commit -m "Move A." && - git checkout -b my-topic-branch master && + git checkout -b my-topic-branch main && echo Second >B && git update-index --add B && git commit -m "Add B." && - git checkout -f master && + git checkout -f main && echo Third >>A && git update-index A && git commit -m "Modify A." &&
@@ -49,23 +49,23 @@ test_expect_success 'prepare repository with topic branches' ' test_expect_success 'rebase on dirty worktree' ' echo dirty >>A && - test_must_fail git rebase master + test_must_fail git rebase main ' test_expect_success 'rebase on dirty cache' ' git add A && - test_must_fail git rebase master + test_must_fail git rebase main ' -test_expect_success 'rebase against master' ' +test_expect_success 'rebase against main' ' git reset --hard HEAD && - git rebase master + git rebase main ' test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' ' git checkout -b orig-head topic && pre="$(git rev-parse --verify HEAD)" && - git rebase master && + git rebase main && test_cmp_rev "$pre" ORIG_HEAD && test_cmp_rev ! "$pre" HEAD '
@@ -96,19 +96,19 @@ test_expect_success 'HEAD was detached during rebase' ' test_expect_success 'rebase from ambiguous branch name' ' git checkout -b topic side && - git rebase master + git rebase main ' test_expect_success 'rebase off of the previous branch using "-"' ' - git checkout master && + git checkout main && git checkout HEAD^ && git rebase @{-1} >expect.messages && - git merge-base master HEAD >expect.forkpoint && + git merge-base main HEAD >expect.forkpoint && - git checkout master && + git checkout main && git checkout HEAD^ && git rebase - >actual.messages && - git merge-base master HEAD >actual.forkpoint && + git merge-base main HEAD >actual.forkpoint && test_cmp expect.forkpoint actual.forkpoint && # the next one is dubious---we may want to say "-",
@@ -117,7 +117,7 @@ test_expect_success 'rebase off of the previous branch using "-"' ' ' test_expect_success 'rebase a single mode change' ' - git checkout master && + git checkout main && git branch -D topic && echo 1 >X && git add X &&
@@ -129,7 +129,7 @@ test_expect_success 'rebase a single mode change' ' test_chmod +x A && test_tick && git commit -m modechange && - GIT_TRACE=1 git rebase master + GIT_TRACE=1 git rebase main ' test_expect_success 'rebase is not broken by diff.renames' '
@@ -165,11 +165,11 @@ test_expect_success 'fail when upstream arg is missing and not configured' ' test_expect_success 'rebase works with format.useAutoBase' ' test_config format.useAutoBase true && git checkout topic && - git rebase master + git rebase main ' test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--merge)' ' - git checkout -b default-base master && + git checkout -b default-base main && git checkout -b default topic && git config branch.default.remote . && git config branch.default.merge refs/heads/default-base &&
@@ -187,7 +187,7 @@ test_expect_success 'default to common base in @{upstream}s reflog if no upstrea ' test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--apply)' ' - git checkout -B default-base master && + git checkout -B default-base main && git checkout -B default topic && git config branch.default.remote . && git config branch.default.merge refs/heads/default-base &&
@@ -229,13 +229,13 @@ test_expect_success 'cherry-picked commits and fork-point work together' ' test_expect_success 'rebase --apply -q is quiet' ' git checkout -b quiet topic && - git rebase --apply -q master >output.out 2>&1 && + git rebase --apply -q main >output.out 2>&1 && test_must_be_empty output.out ' test_expect_success 'rebase --merge -q is quiet' ' git checkout -B quiet topic && - git rebase --merge -q master >output.out 2>&1 && + git rebase --merge -q main >output.out 2>&1 && test_must_be_empty output.out '
@@ -297,7 +297,7 @@ test_expect_success 'rebase commit with an ancient timestamp' ' ' test_expect_success 'rebase with "From " line in commit message' ' - git checkout -b preserve-from master~1 && + git checkout -b preserve-from main~1 && cat >From_.msg <<EOF && Somebody embedded an mbox in a commit message
@@ -313,7 +313,7 @@ EOF >From_ && git add From_ && git commit -F From_.msg && - git rebase master && + git rebase main && git log -1 --pretty=format:%B >out && test_cmp From_.msg out '
@@ -360,12 +360,12 @@ test_expect_success 'rebase --apply and .gitattributes' ' git cherry-pick test && git checkout test && - git rebase master && + git rebase main && grep "smudged" a.txt && git checkout removal && git reset --hard && - git rebase master && + git rebase main && grep "clean" a.txt ) '
@@ -405,20 +405,20 @@ test_expect_success 'rebase -c rebase.useBuiltin=false warning' ' ' test_expect_success 'switch to branch checked out here' ' - git checkout master && - git rebase master master + git checkout main && + git rebase main main ' test_expect_success 'switch to branch not checked out' ' - git checkout master && + git checkout main && git branch other && - git rebase master other + git rebase main other ' test_expect_success 'refuse to switch to branch checked out elsewhere' ' - git checkout master && + git checkout main && git worktree add wt && - test_must_fail git -C wt rebase master master 2>err && + test_must_fail git -C wt rebase main main 2>err && test_i18ngrep "already checked out" err '
t/t3402-rebase-merge.sh +23 -23
140 lines not on this page · raw message
t/t3403-rebase-skip.sh +4 -4
@@ -5,7 +5,7 @@ test_description='git rebase --merge --skip tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -51,7 +51,7 @@ test_expect_success setup ' ' test_expect_success 'rebase with git am -3 (default)' ' - test_must_fail git rebase master + test_must_fail git rebase main ' test_expect_success 'rebase --skip can not be used with other options' '
@@ -67,7 +67,7 @@ test_expect_success 'rebase moves back to skip-reference' ' test refs/heads/skip-reference = $(git symbolic-ref HEAD) && git branch post-rebase && git reset --hard pre-rebase && - test_must_fail git rebase master && + test_must_fail git rebase main && echo "hello" > hello && git add hello && git rebase --continue &&
@@ -78,7 +78,7 @@ test_expect_success 'rebase moves back to skip-reference' ' test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge' test_expect_success 'rebase with --merge' ' - test_must_fail git rebase --merge master + test_must_fail git rebase --merge main ' test_expect_success 'rebase --skip with --merge' '
t/t3405-rebase-malformed.sh +5 -5
@@ -2,7 +2,7 @@ test_description='rebase should handle arbitrary git message' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -55,7 +55,7 @@ test_expect_success setup ' git add file3 && git commit --allow-empty-message -m "" && - git checkout master && + git checkout main && echo One >file1 && test_tick &&
@@ -65,7 +65,7 @@ test_expect_success setup ' test_expect_success 'rebase commit with multi-line subject' ' - git rebase master multi-line-subject && + git rebase main multi-line-subject && git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 && test_cmp F0 F1 &&
@@ -73,14 +73,14 @@ test_expect_success 'rebase commit with multi-line subject' ' ' test_expect_success 'rebase commit with diff in message' ' - git rebase master diff-in-message && + git rebase main diff-in-message && git cat-file commit HEAD | sed -e "1,/^$/d" >G1 && test_cmp G0 G1 && test_cmp G G0 ' test_expect_success 'rebase -m commit with empty message' ' - git rebase -m master empty-message-merge + git rebase -m main empty-message-merge ' test_expect_success 'rebase -i commit with empty message' '
t/t3406-rebase-message.sh +13 -13
@@ -2,7 +2,7 @@ test_description='messages from rebase operation' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -21,27 +21,27 @@ test_expect_success 'setup' ' ' test_expect_success 'rebase -m' ' - git rebase -m master >actual && + git rebase -m main >actual && test_must_be_empty actual ' -test_expect_success 'rebase against master twice' ' - git rebase --apply master >out && +test_expect_success 'rebase against main twice' ' + git rebase --apply main >out && test_i18ngrep "Current branch topic is up to date" out ' -test_expect_success 'rebase against master twice with --force' ' - git rebase --force-rebase --apply master >out && +test_expect_success 'rebase against main twice with --force' ' + git rebase --force-rebase --apply main >out && test_i18ngrep "Current branch topic is up to date, rebase forced" out ' -test_expect_success 'rebase against master twice from another branch' ' +test_expect_success 'rebase against main twice from another branch' ' git checkout topic^ && - git rebase --apply master topic >out && + git rebase --apply main topic >out && test_i18ngrep "Current branch topic is up to date" out ' -test_expect_success 'rebase fast-forward to master' ' +test_expect_success 'rebase fast-forward to main' ' git checkout topic^ && git rebase --apply topic >out && test_i18ngrep "Fast-forwarded HEAD to topic" out
@@ -49,21 +49,21 @@ test_expect_success 'rebase fast-forward to master' ' test_expect_success 'rebase --stat' ' git reset --hard start && - git rebase --stat master >diffstat.txt && + git rebase --stat main >diffstat.txt && grep "^ fileX | *1 +$" diffstat.txt ' test_expect_success 'rebase w/config rebase.stat' ' git reset --hard start && git config rebase.stat true && - git rebase master >diffstat.txt && + git rebase main >diffstat.txt && grep "^ fileX | *1 +$" diffstat.txt ' test_expect_success 'rebase -n overrides config rebase.stat config' ' git reset --hard start && git config rebase.stat true && - git rebase -n master >diffstat.txt && + git rebase -n main >diffstat.txt && ! grep "^ fileX | *1 +$" diffstat.txt '
@@ -116,7 +116,7 @@ test_expect_success 'rebase -i onto unrelated history' ' git init unrelated && test_commit -C unrelated 1 && git -C unrelated remote add -f origin "$PWD" && - git -C unrelated branch --set-upstream-to=origin/master && + git -C unrelated branch --set-upstream-to=origin/main && git -C unrelated -c core.editor=true rebase -i -v --stat >actual && test_i18ngrep "Changes to " actual && test_i18ngrep "5 files changed" actual
t/t3407-rebase-abort.sh +10 -10
@@ -2,7 +2,7 @@ test_description='git rebase --abort tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -40,7 +40,7 @@ testrebase() { cd "$work_dir" && # Clean up the state from the previous one git reset --hard pre-rebase && - test_must_fail git rebase$type master && + test_must_fail git rebase$type main && test_path_is_dir "$dotest" && git rebase --abort && test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
@@ -51,10 +51,10 @@ testrebase() { cd "$work_dir" && # Clean up the state from the previous one git reset --hard pre-rebase && - test_must_fail git rebase$type master && + test_must_fail git rebase$type main && test_path_is_dir "$dotest" && test_must_fail git rebase --skip && - test $(git rev-parse HEAD) = $(git rev-parse master) && + test $(git rev-parse HEAD) = $(git rev-parse main) && git rebase --abort && test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) && test ! -d "$dotest"
@@ -64,13 +64,13 @@ testrebase() { cd "$work_dir" && # Clean up the state from the previous one git reset --hard pre-rebase && - test_must_fail git rebase$type master && + test_must_fail git rebase$type main && test_path_is_dir "$dotest" && echo c > a && echo d >> a && git add a && test_must_fail git rebase --continue && - test $(git rev-parse HEAD) != $(git rev-parse master) && + test $(git rev-parse HEAD) != $(git rev-parse main) && git rebase --abort && test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) && test ! -d "$dotest"
@@ -81,7 +81,7 @@ testrebase() { # Clean up the state from the previous one git reset --hard pre-rebase && git reflog show to-rebase > reflog_before && - test_must_fail git rebase$type master && + test_must_fail git rebase$type main && git rebase --abort && git reflog show to-rebase > reflog_after && test_cmp reflog_before reflog_after &&
@@ -92,7 +92,7 @@ testrebase() { cd "$work_dir" && # Clean up the state from the previous one git reset --hard pre-rebase && - test_must_fail git rebase$type master && + test_must_fail git rebase$type main && test_must_fail git rebase -v --abort && test_must_fail git rebase --abort -v && git rebase --abort
@@ -106,7 +106,7 @@ test_expect_success 'rebase --apply --quit' ' cd "$work_dir" && # Clean up the state from the previous one git reset --hard pre-rebase && - test_must_fail git rebase --apply master && + test_must_fail git rebase --apply main && test_path_is_dir .git/rebase-apply && head_before=$(git rev-parse HEAD) && git rebase --quit &&
@@ -118,7 +118,7 @@ test_expect_success 'rebase --merge --quit' ' cd "$work_dir" && # Clean up the state from the previous one git reset --hard pre-rebase && - test_must_fail git rebase --merge master && + test_must_fail git rebase --merge main && test_path_is_dir .git/rebase-merge && head_before=$(git rev-parse HEAD) && git rebase --quit &&
t/t3408-rebase-multi-line.sh +2 -2
@@ -2,7 +2,7 @@ test_description='rebasing a commit with multi-line first paragraph.' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -49,7 +49,7 @@ But otherwise with a sane description." side2 && test_expect_success rebase ' git checkout side && - git rebase master && + git rebase main && git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect && test_cmp expect actual
t/t3409-rebase-preserve-merges.sh +6 -6
@@ -6,7 +6,7 @@ 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 +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -21,7 +21,7 @@ export GIT_AUTHOR_EMAIL # Clone 2 (conflicting merge): # -# A1--A2--B3 <-- origin/master +# A1--A2--B3 <-- origin/main # \ \ # B1------M <-- topic # \
@@ -29,7 +29,7 @@ export GIT_AUTHOR_EMAIL # # Clone 3 (no-ff merge): # -# A1--A2--B3 <-- origin/master +# A1--A2--B3 <-- origin/main # \ # B1------M <-- topic # \ /
@@ -47,7 +47,7 @@ test_expect_success 'setup for merge-preserving rebase' \ echo Second > B && git add B && git commit -m "Add B1" && - git checkout -f master && + git checkout -f main && echo Third >> A && git commit -a -m "Modify A2" && echo Fifth > B &&
@@ -58,10 +58,10 @@ test_expect_success 'setup for merge-preserving rebase' \ ( cd clone2 && git checkout -b topic origin/topic && - test_must_fail git merge origin/master && + test_must_fail git merge origin/main && echo Resolved >B && git add B && - git commit -m "Merge origin/master into topic" + git commit -m "Merge origin/main into topic" ) && git clone ./. clone3 &&
t/t3412-rebase-root.sh +15 -15
@@ -4,7 +4,7 @@ test_description='git rebase --root Tests if git rebase --root --onto <newparent> can rebase the root commit. ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -27,7 +27,7 @@ test_expect_success 'prepare repository' ' test_expect_success 'rebase --root fails with too many args' ' git checkout -B fail other && - test_must_fail git rebase --onto master --root fail fail + test_must_fail git rebase --onto main --root fail fail ' test_expect_success 'setup pre-rebase hook' '
@@ -47,7 +47,7 @@ EOF test_expect_success 'rebase --root --onto <newbase>' ' git checkout -b work other && - git rebase --root --onto master && + git rebase --root --onto main && git log --pretty=tformat:"%s" > rebased && test_cmp expect rebased '
@@ -58,7 +58,7 @@ test_expect_success 'pre-rebase got correct input (1)' ' test_expect_success 'rebase --root --onto <newbase> <branch>' ' git branch work2 other && - git rebase --root --onto master work2 && + git rebase --root --onto main work2 && git log --pretty=tformat:"%s" > rebased2 && test_cmp expect rebased2 '
@@ -69,7 +69,7 @@ test_expect_success 'pre-rebase got correct input (2)' ' test_expect_success 'rebase -i --root --onto <newbase>' ' git checkout -b work3 other && - git rebase -i --root --onto master && + git rebase -i --root --onto main && git log --pretty=tformat:"%s" > rebased3 && test_cmp expect rebased3 '
@@ -80,7 +80,7 @@ test_expect_success 'pre-rebase got correct input (3)' ' test_expect_success 'rebase -i --root --onto <newbase> <branch>' ' git branch work4 other && - git rebase -i --root --onto master work4 && + git rebase -i --root --onto main work4 && git log --pretty=tformat:"%s" > rebased4 && test_cmp expect rebased4 '
@@ -91,7 +91,7 @@ test_expect_success 'pre-rebase got correct input (4)' ' test_expect_success REBASE_P 'rebase -i -p with linear history' ' git checkout -b work5 other && - git rebase -i -p --root --onto master && + git rebase -i -p --root --onto main && git log --pretty=tformat:"%s" > rebased5 && test_cmp expect rebased5 '
@@ -125,7 +125,7 @@ EOF test_expect_success REBASE_P 'rebase -i -p with merge' ' git checkout -b work6 other && - git rebase -i -p --root --onto master && + git rebase -i -p --root --onto main && log_with_names work6 > rebased6 && test_cmp expect-side rebased6 '
@@ -160,7 +160,7 @@ EOF test_expect_success REBASE_P 'rebase -i -p with two roots' ' git checkout -b work7 other && - git rebase -i -p --root --onto master && + git rebase -i -p --root --onto main && log_with_names work7 > rebased7 && test_cmp expect-third rebased7 '
@@ -176,14 +176,14 @@ EOF test_expect_success 'pre-rebase hook stops rebase' ' git checkout -b stops1 other && - test_must_fail git rebase --root --onto master && + test_must_fail git rebase --root --onto main && test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 && test 0 = $(git rev-list other...stops1 | wc -l) ' test_expect_success 'pre-rebase hook stops rebase -i' ' git checkout -b stops2 other && - test_must_fail git rebase --root --onto master && + test_must_fail git rebase --root --onto main && test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 && test 0 = $(git rev-list other...stops2 | wc -l) '
@@ -193,7 +193,7 @@ test_expect_success 'remove pre-rebase hook' ' ' test_expect_success 'set up a conflict' ' - git checkout master && + git checkout main && echo conflict > B && git add B && git commit -m conflict
@@ -201,7 +201,7 @@ test_expect_success 'set up a conflict' ' test_expect_success 'rebase --root with conflict (first part)' ' git checkout -b conflict1 other && - test_must_fail git rebase --root --onto master && + test_must_fail git rebase --root --onto main && git ls-files -u | grep "B$" '
@@ -228,7 +228,7 @@ test_expect_success 'rebase --root with conflict (second part)' ' test_expect_success 'rebase -i --root with conflict (first part)' ' git checkout -b conflict2 other && - test_must_fail git rebase -i --root --onto master && + test_must_fail git rebase -i --root --onto main && git ls-files -u | grep "B$" '
@@ -266,7 +266,7 @@ EOF test_expect_success REBASE_P 'rebase -i -p --root with conflict (first part)' ' git checkout -b conflict3 other && - test_must_fail git rebase -i -p --root --onto master && + test_must_fail git rebase -i -p --root --onto main && git ls-files -u | grep "B$" '
t/t3413-rebase-hook.sh +22 -22
131 lines not on this page · raw message
t/t3415-rebase-autosquash.sh +2 -2
@@ -2,7 +2,7 @@ test_description='auto squash' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -410,7 +410,7 @@ test_expect_success 'wrapped original subject' ' test_expect_success 'abort last squash' ' test_when_finished "test_might_fail git rebase --abort" && - test_when_finished "git checkout master" && + test_when_finished "git checkout main" && git checkout -b some-squashes && git commit --allow-empty -m first &&
t/t3416-rebase-onto-threedots.sh +28 -28
174 lines not on this page · raw message
t/t3418-rebase-continue.sh +13 -13
@@ -2,7 +2,7 @@ test_description='git rebase --continue tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -18,13 +18,13 @@ test_expect_success 'setup' ' git checkout -b topic HEAD^ && test_commit "commit-new-file-F2-on-topic-branch" F2 22 && - git checkout master + git checkout main ' test_expect_success 'interactive rebase --continue works with touched file' ' rm -fr .git/rebase-* && git reset --hard && - git checkout master && + git checkout main && FAKE_LINES="edit 1" git rebase -i HEAD^ && test-tool chmtime =-60 F1 &&
@@ -34,9 +34,9 @@ test_expect_success 'interactive rebase --continue works with touched file' ' test_expect_success 'non-interactive rebase --continue works with touched file' ' rm -fr .git/rebase-* && git reset --hard && - git checkout master && + git checkout main && - test_must_fail git rebase --onto master master topic && + test_must_fail git rebase --onto main main topic && echo "Resolved" >F2 && git add F2 && test-tool chmtime =-60 F1 &&
@@ -64,7 +64,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' ' chmod +x test-bin/git-merge-funny && ( PATH=./test-bin:$PATH && - test_must_fail git rebase -s funny -Xopt master topic + test_must_fail git rebase -s funny -Xopt main topic ) && test -f funny.was.run && rm funny.was.run &&
@@ -96,7 +96,7 @@ test_expect_success 'rebase -i --continue handles merge strategy and options' ' chmod +x test-bin/git-merge-funny && ( PATH=./test-bin:$PATH && - test_must_fail git rebase -i -s funny -Xopt -Xfoo master topic + test_must_fail git rebase -i -s funny -Xopt -Xfoo main topic ) && test -f funny.was.run && rm funny.was.run &&
@@ -191,11 +191,11 @@ test_expect_success '--skip after failed fixup cleans commit message' ' test_expect_success 'setup rerere database' ' rm -fr .git/rebase-* && git reset --hard commit-new-file-F3-on-topic-branch && - git checkout master && + git checkout main && test_commit "commit-new-file-F3" F3 3 && test_config rerere.enabled true && git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch && - test_must_fail git rebase -m master topic && + test_must_fail git rebase -m main topic && echo "Resolved" >F2 && cp F2 expected-F2 && git add F2 &&
@@ -210,7 +210,7 @@ test_expect_success 'setup rerere database' ' prepare () { rm -fr .git/rebase-* && git reset --hard commit-new-file-F3-on-topic-branch && - git checkout master && + git checkout main && test_config rerere.enabled true }
@@ -218,7 +218,7 @@ test_rerere_autoupdate () { action=$1 && test_expect_success "rebase $action --continue remembers --rerere-autoupdate" ' prepare && - test_must_fail git rebase $action --rerere-autoupdate master topic && + test_must_fail git rebase $action --rerere-autoupdate main topic && test_cmp expected-F2 F2 && git diff-files --quiet && test_must_fail git rebase --continue &&
@@ -230,7 +230,7 @@ test_rerere_autoupdate () { test_expect_success "rebase $action --continue honors rerere.autoUpdate" ' prepare && test_config rerere.autoupdate true && - test_must_fail git rebase $action master topic && + test_must_fail git rebase $action main topic && test_cmp expected-F2 F2 && git diff-files --quiet && test_must_fail git rebase --continue &&
@@ -242,7 +242,7 @@ test_rerere_autoupdate () { test_expect_success "rebase $action --continue remembers --no-rerere-autoupdate" ' prepare && test_config rerere.autoupdate true && - test_must_fail git rebase $action --no-rerere-autoupdate master topic && + test_must_fail git rebase $action --no-rerere-autoupdate main topic && test_cmp expected-F2 F2 && test_must_fail git diff-files --quiet && git add F2 &&
t/t3419-rebase-patch-id.sh +7 -7
@@ -2,7 +2,7 @@ test_description='git rebase - test patch id computation' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -27,7 +27,7 @@ test_expect_success 'setup' ' test_expect_success 'setup: 500 lines' ' rm -f .gitattributes && - git checkout -q -f master && + git checkout -q -f main && git reset --hard root && test_seq 500 >file && git add file &&
@@ -43,7 +43,7 @@ test_expect_success 'setup: 500 lines' ' git add newfile && git commit -q -m "add small file" && - git cherry-pick master >/dev/null 2>&1 + git cherry-pick main >/dev/null 2>&1 ' test_expect_success 'setup attributes' '
@@ -51,18 +51,18 @@ test_expect_success 'setup attributes' ' ' test_expect_success 'detect upstream patch' ' - git checkout -q master && + git checkout -q main && scramble file && git add file && git commit -q -m "change big file again" && git checkout -q other^{} && - git rebase master && - git rev-list master...HEAD~ >revs && + git rebase main && + git rev-list main...HEAD~ >revs && test_must_be_empty revs ' test_expect_success 'do not drop patch' ' - git branch -f squashed master && + git branch -f squashed main && git checkout -q -f squashed && git reset -q --soft HEAD~2 && git commit -q -m squashed &&
t/t3420-rebase-autostash.sh +5 -5
@@ -4,7 +4,7 @@ # test_description='git rebase --autostash tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -24,12 +24,12 @@ test_expect_success setup ' git add . && test_tick && git commit -m "third commit" && - git checkout -b unrelated-onto-branch master && + git checkout -b unrelated-onto-branch main && echo unrelated >file4 && git add . && test_tick && git commit -m "unrelated commit" && - git checkout -b related-onto-branch master && + git checkout -b related-onto-branch main && echo conflicting-change >file2 && git add . && test_tick &&
@@ -308,7 +308,7 @@ test_expect_success 'autostash is saved on editor failure with conflict' ' ' test_expect_success 'autostash with dirty submodules' ' - test_when_finished "git reset --hard && git checkout master" && + test_when_finished "git reset --hard && git checkout main" && git checkout -b with-submodule && git submodule add ./ sub && test_tick &&
@@ -327,7 +327,7 @@ test_expect_success 'branch is left alone when possible' ' test_expect_success 'never change active branch' ' git checkout -b not-the-feature-branch unrelated-onto-branch && - test_when_finished "git reset --hard && git checkout master" && + test_when_finished "git reset --hard && git checkout main" && echo changed >file0 && git rebase --autostash not-the-feature-branch feature-branch && test_cmp_rev not-the-feature-branch unrelated-onto-branch
t/t3423-rebase-reword.sh +3 -3
@@ -7,7 +7,7 @@ test_description='git rebase interactive with rewording' . "$TEST_DIRECTORY"/lib-rebase.sh test_expect_success 'setup' ' - test_commit master file-1 test && + test_commit main file-1 test && git checkout -b stuff &&
@@ -22,7 +22,7 @@ test_expect_success 'reword without issues functions as intended' ' set_fake_editor && FAKE_LINES="pick 1 reword 2" FAKE_COMMIT_MESSAGE="feature_b_reworded" \ - git rebase -i -v master && + git rebase -i -v main && test "$(git log -1 --format=%B)" = "feature_b_reworded" && test $(git rev-list --count HEAD) = 3
@@ -35,7 +35,7 @@ test_expect_success 'reword after a conflict preserves commit' ' set_fake_editor && test_must_fail env FAKE_LINES="reword 2" \ - git rebase -i -v master && + git rebase -i -v main && git checkout --theirs file-2 && git add file-2 &&
t/t3427-rebase-subtree.sh +11 -11
@@ -4,7 +4,7 @@ test_description='git rebase tests for -Xsubtree This test runs git rebase and tests the subtree strategy. ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -20,7 +20,7 @@ commit_message() { # # topic_1 - topic_2 - topic_3 # \ -# README ---------------------- Add subproject master - topic_4 - files_subtree/topic_5 +# README ---------------------- Add subproject main - topic_4 - files_subtree/topic_5 # # Where the merge moves the files topic_[123].t into the subdirectory # files_subtree/ and topic_4 as well as files_subtree/topic_5 add files to that
@@ -31,7 +31,7 @@ commit_message() { # an empty commit is added on top. The pre-rebase commit history looks like # this: # -# Add subproject master - topic_4 - files_subtree/topic_5 - Empty commit +# Add subproject main - topic_4 - files_subtree/topic_5 - Empty commit # # where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t. #
@@ -51,11 +51,11 @@ test_expect_success 'setup' ' test_commit -C files topic_3 && : perform subtree merge into files_subtree/ && - git fetch files refs/heads/master:refs/heads/files-master && + git fetch files refs/heads/main:refs/heads/files-main && git merge -s ours --no-commit --allow-unrelated-histories \ - files-master && - git read-tree --prefix=files_subtree -u files-master && - git commit -m "Add subproject master" && + files-main && + git read-tree --prefix=files_subtree -u files-main && + git commit -m "Add subproject main" && : add two extra commits to rebase && test_commit -C files_subtree topic_4 &&
@@ -73,7 +73,7 @@ test_expect_success 'setup' ' test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' ' reset_rebase && git checkout -b rebase-preserve-merges to-rebase && - git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master && + git rebase -Xsubtree=files_subtree --preserve-merges --onto files-main main && verbose test "$(commit_message HEAD~)" = "topic_4" && verbose test "$(commit_message HEAD)" = "files_subtree/topic_5" '
@@ -82,7 +82,7 @@ test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' ' reset_rebase && git checkout -b rebase-keep-empty to-rebase && - git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master && + git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-main main && verbose test "$(commit_message HEAD~2)" = "topic_4" && verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" && verbose test "$(commit_message HEAD)" = "Empty commit"
@@ -91,7 +91,7 @@ test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges -- test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' ' reset_rebase && git checkout -b rebase-onto to-rebase && - test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master && + test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-main main && : first pick results in no changes && git rebase --skip && verbose test "$(commit_message HEAD~2)" = "topic_4" &&
@@ -102,7 +102,7 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' ' test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' ' reset_rebase && git checkout -b rebase-merges-onto to-rebase && - test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root && + test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-main --root && : first pick results in no changes && git rebase --skip && verbose test "$(commit_message HEAD~2)" = "topic_4" &&
t/t3430-rebase-merges.sh +9 -9
@@ -12,13 +12,13 @@ Initial setup: -- B -- (first) / \ - A - C - D - E - H (master) + A - C - D - E - H (main) \ \ / \ F - G (second) \ Conflicting-G ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -40,7 +40,7 @@ test_expect_success 'setup' ' git checkout -b first && test_commit B && b=$(git rev-parse --short HEAD) && - git checkout master && + git checkout main && test_commit C && c=$(git rev-parse --short HEAD) && test_commit D &&
@@ -55,7 +55,7 @@ test_expect_success 'setup' ' f=$(git rev-parse --short HEAD) && test_commit G && g=$(git rev-parse --short HEAD) && - git checkout master && + git checkout main && git merge --no-commit G && test_tick && git commit -m H &&
@@ -85,7 +85,7 @@ test_expect_success 'create completely different structure' ' EOF test_config sequence.editor \""$PWD"/replace-editor.sh\" && test_tick && - git rebase -i -r A master && + git rebase -i -r A main && test_cmp_graph <<-\EOF * Merge the topic branch '\''onebranch'\'' |\
@@ -186,7 +186,7 @@ test_expect_success 'fast-forward merge -c still rewords' ' ' test_expect_success 'with a branch tip that was cherry-picked already' ' - git checkout -b already-upstream master && + git checkout -b already-upstream main && base="$(git rev-parse --verify HEAD)" && test_commit A1 &&
@@ -214,7 +214,7 @@ test_expect_success 'with a branch tip that was cherry-picked already' ' ' test_expect_success 'do not rebase cousins unless asked for' ' - git checkout -b cousins master && + git checkout -b cousins main && before="$(git rev-parse --verify HEAD)" && test_tick && git rebase -r HEAD^ &&
@@ -343,7 +343,7 @@ test_expect_success 'a "merge" into a root commit is a fast-forward' ' test_expect_success 'A root commit can be a cousin, treat it that way' ' git checkout --orphan khnum && test_commit yama && - git checkout -b asherah master && + git checkout -b asherah main && test_commit shamkat && git merge --allow-unrelated-histories khnum && test_tick &&
@@ -370,7 +370,7 @@ test_expect_success 'labels that are object IDs are rewritten' ' git checkout -b third B && test_commit I && third=$(git rev-parse HEAD) && - git checkout -b labels master && + git checkout -b labels main && git merge --no-commit third && test_tick && git commit -m "Merge commit '\''$third'\'' into labels" &&
t/t3431-rebase-fork-point.sh +17 -17
@@ -5,16 +5,16 @@ test_description='git rebase --fork-point test' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh -# A---B---D---E (master) +# A---B---D---E (main) # \ # C*---F---G (side) # -# C was formerly part of master but master was rewound to remove C +# C was formerly part of main but main was rewound to remove C # test_expect_success setup ' test_commit A &&
@@ -33,7 +33,7 @@ test_rebase () { expected="$1" && shift && test_expect_success "git rebase $*" " - git checkout master && + git checkout main && git reset --hard E && git checkout side && git reset --hard G &&
@@ -51,26 +51,26 @@ test_rebase 'G F C E D B A' --no-fork-point test_rebase 'G F C D B A' --no-fork-point --onto D test_rebase 'G F C B A' --no-fork-point --keep-base -test_rebase 'G F E D B A' --fork-point refs/heads/master -test_rebase 'G F E D B A' --fork-point master +test_rebase 'G F E D B A' --fork-point refs/heads/main +test_rebase 'G F E D B A' --fork-point main -test_rebase 'G F D B A' --fork-point --onto D refs/heads/master -test_rebase 'G F D B A' --fork-point --onto D master +test_rebase 'G F D B A' --fork-point --onto D refs/heads/main +test_rebase 'G F D B A' --fork-point --onto D main -test_rebase 'G F B A' --fork-point --keep-base refs/heads/master -test_rebase 'G F B A' --fork-point --keep-base master +test_rebase 'G F B A' --fork-point --keep-base refs/heads/main +test_rebase 'G F B A' --fork-point --keep-base main -test_rebase 'G F C E D B A' refs/heads/master -test_rebase 'G F C E D B A' master +test_rebase 'G F C E D B A' refs/heads/main +test_rebase 'G F C E D B A' main -test_rebase 'G F C D B A' --onto D refs/heads/master -test_rebase 'G F C D B A' --onto D master +test_rebase 'G F C D B A' --onto D refs/heads/main +test_rebase 'G F C D B A' --onto D main -test_rebase 'G F C B A' --keep-base refs/heads/master -test_rebase 'G F C B A' --keep-base master +test_rebase 'G F C B A' --keep-base refs/heads/main +test_rebase 'G F C B A' --keep-base main test_expect_success 'git rebase --fork-point with ambigous refname' ' - git checkout master && + git checkout main && git checkout -b one && git checkout side && git tag one &&
t/t3432-rebase-fast-forward.sh +18 -18
@@ -5,7 +5,7 @@ test_description='ensure rebase fast-forwards commits when possible' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -87,19 +87,19 @@ test_rebase_same_head_ () { changes='no changes' test_rebase_same_head success noop same success work same -test_rebase_same_head success noop same success work same master +test_rebase_same_head success noop same success work same main test_rebase_same_head success noop same success work diff --onto B B test_rebase_same_head success noop same success work diff --onto B... B -test_rebase_same_head success noop same success work same --onto master... master -test_rebase_same_head success noop same success work same --keep-base master +test_rebase_same_head success noop same success work same --onto main... main +test_rebase_same_head success noop same success work same --keep-base main test_rebase_same_head success noop same success work same --keep-base test_rebase_same_head success noop same success work same --no-fork-point test_rebase_same_head success noop same success work same --keep-base --no-fork-point -test_rebase_same_head success noop same success work same --fork-point master +test_rebase_same_head success noop same success work same --fork-point main test_rebase_same_head success noop same success work diff --fork-point --onto B B test_rebase_same_head success noop same success work diff --fork-point --onto B... B -test_rebase_same_head success noop same success work same --fork-point --onto master... master -test_rebase_same_head success noop same success work same --keep-base --keep-base master +test_rebase_same_head success noop same success work same --fork-point --onto main... main +test_rebase_same_head success noop same success work same --keep-base --keep-base main test_expect_success 'add work same to side' ' test_commit E
@@ -107,22 +107,22 @@ test_expect_success 'add work same to side' ' changes='our changes' test_rebase_same_head success noop same success work same -test_rebase_same_head success noop same success work same master +test_rebase_same_head success noop same success work same main test_rebase_same_head success noop same success work diff --onto B B test_rebase_same_head success noop same success work diff --onto B... B -test_rebase_same_head success noop same success work same --onto master... master -test_rebase_same_head success noop same success work same --keep-base master +test_rebase_same_head success noop same success work same --onto main... main +test_rebase_same_head success noop same success work same --keep-base main test_rebase_same_head success noop same success work same --keep-base test_rebase_same_head success noop same success work same --no-fork-point test_rebase_same_head success noop same success work same --keep-base --no-fork-point -test_rebase_same_head success noop same success work same --fork-point master +test_rebase_same_head success noop same success work same --fork-point main test_rebase_same_head success noop same success work diff --fork-point --onto B B test_rebase_same_head success noop same success work diff --fork-point --onto B... B -test_rebase_same_head success noop same success work same --fork-point --onto master... master -test_rebase_same_head success noop same success work same --fork-point --keep-base master +test_rebase_same_head success noop same success work same --fork-point --onto main... main +test_rebase_same_head success noop same success work same --fork-point --keep-base main test_expect_success 'add work same to upstream' ' - git checkout master && + git checkout main && test_commit F && git checkout side '
@@ -130,12 +130,12 @@ test_expect_success 'add work same to upstream' ' changes='our and their changes' test_rebase_same_head success noop same success work diff --onto B B test_rebase_same_head success noop same success work diff --onto B... B -test_rebase_same_head success noop same success work diff --onto master... master -test_rebase_same_head success noop same success work diff --keep-base master +test_rebase_same_head success noop same success work diff --onto main... main +test_rebase_same_head success noop same success work diff --keep-base main test_rebase_same_head success noop same success work diff --keep-base test_rebase_same_head failure work same success work diff --fork-point --onto B B test_rebase_same_head failure work same success work diff --fork-point --onto B... B -test_rebase_same_head success noop same success work diff --fork-point --onto master... master -test_rebase_same_head success noop same success work diff --fork-point --keep-base master +test_rebase_same_head success noop same success work diff --fork-point --onto main... main +test_rebase_same_head success noop same success work diff --fork-point --keep-base main test_done
t/t3434-rebase-i18n.sh +5 -5
@@ -7,14 +7,14 @@ test_description='rebase with changing encoding Initial setup: -1 - 2 master +1 - 2 main \ 3 - 4 first \ 5 - 6 second ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -44,7 +44,7 @@ test_expect_success 'rebase --rebase-merges update encoding eucJP to UTF-8' ' git config i18n.commitencoding eucJP && git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && git config i18n.commitencoding UTF-8 && - git rebase --rebase-merges master && + git rebase --rebase-merges main && compare_msg eucJP.txt eucJP UTF-8 '
@@ -53,7 +53,7 @@ test_expect_success 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP git config i18n.commitencoding eucJP && git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && git config i18n.commitencoding ISO-2022-JP && - git rebase --rebase-merges master && + git rebase --rebase-merges main && compare_msg eucJP.txt eucJP ISO-2022-JP '
@@ -69,7 +69,7 @@ test_rebase_continue_update_encode () { git config i18n.commitencoding $old && git commit -F "$TEST_DIRECTORY/t3434/$msgfile" && git config i18n.commitencoding $new && - test_must_fail git rebase -m master && + test_must_fail git rebase -m main && test -f .git/rebase-merge/message && git stripspace <.git/rebase-merge/message >two.t && git add two.t &&
t/t3435-rebase-gpg-sign.sh +3 -3
@@ -5,7 +5,7 @@ test_description='test rebase --[no-]gpg-sign' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -49,7 +49,7 @@ test_expect_success 'setup: merge commit' ' test_commit fork-point && git switch -c side && test_commit three && - git switch master && + git switch main && git merge --no-ff side && git tag merged '
@@ -67,7 +67,7 @@ test_rebase_gpg_sign false -i --no-gpg-sign --gpg-sign test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' ' git reset --hard merged && git config commit.gpgsign true && - git rebase -p --no-gpg-sign --onto=one fork-point master && + git rebase -p --no-gpg-sign --onto=one fork-point main && test_must_fail git verify-commit HEAD '
t/t3436-rebase-more-options.sh +1 -1
@@ -28,7 +28,7 @@ test_expect_success 'setup' ' test_commit commit2 foo foo2 && test_commit commit3 foo foo3 && - git checkout --orphan master && + git checkout --orphan main && rm foo && test_write_lines "line 1" " line 2" "line 3" >file && git commit -am "add file" &&
Signature · 1 line
gitgitgadget
PATCH v3 8/28 t3[5-9]*: adjust the references to the default branch name "main"
In reply to Johannes Schindelin via GitGitGadgetFrom: Johannes Schindelin <[email protected]>
This trick was performed via
$ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t3[5-9]*.sh)
This allows us to define GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main for those tests.
Signed-off-by Johannes Schindelin <[email protected]>
--- t/t3500-cherry.sh | 14 +++++----- t/t3501-revert-cherry-pick.sh | 6 ++--- t/t3502-cherry-pick-merge.sh | 4 +-- t/t3503-cherry-pick-root.sh | 12 ++++----- t/t3504-cherry-pick-rerere.sh | 26 +++++++++--------- t/t3505-cherry-pick-empty.sh | 26 +++++++++--------- t/t3506-cherry-pick-ff.sh | 10 +++---- t/t3507-cherry-pick-conflict.sh | 4 +-- t/t3508-cherry-pick-many-commits.sh | 40 +++++++++++++-------------- t/t3509-cherry-pick-merge-df.sh | 4 +-- t/t3512-cherry-pick-submodule.sh | 4 +-- t/t3600-rm.sh | 12 ++++----- t/t3701-add-interactive.sh | 6 ++--- t/t3901-i18n-patch.sh | 42 ++++++++++++++--------------- t/t3903-stash.sh | 34 +++++++++++------------ t/t3910-mac-os-precompose.sh | 8 +++--- 16 files changed, 126 insertions(+), 126 deletions(-)
t/t3500-cherry.sh +7 -7
@@ -5,10 +5,10 @@ test_description='git cherry should detect patches integrated upstream -This test cherry-picks one local change of two into master branch, and +This test cherry-picks one local change of two into main branch, and checks that git cherry only returns the second patch in the local branch ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -35,7 +35,7 @@ test_expect_success \ test_tick && git commit -m "Add C." && - git checkout -f master && + git checkout -f main && rm -f B C && echo Third >> A &&
@@ -43,19 +43,19 @@ test_expect_success \ test_tick && git commit -m "Modify A." && - expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*" + expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* + .*" ' test_expect_success \ 'check that cherry with limit returns only the top patch'\ - 'expr "$(echo $(git cherry master my-topic-branch my-topic-branch^1) )" : "+ [^ ]*" + 'expr "$(echo $(git cherry main my-topic-branch my-topic-branch^1) )" : "+ [^ ]*" ' test_expect_success \ 'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' \ 'git cherry-pick my-topic-branch^0 && - echo $(git cherry master my-topic-branch) && - expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* - .*" + echo $(git cherry main my-topic-branch) && + expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* - .*" ' test_expect_success 'cherry ignores whitespace' '
t/t3501-revert-cherry-pick.sh +3 -3
@@ -10,7 +10,7 @@ test_description='test cherry-pick and revert with renames ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -115,7 +115,7 @@ test_expect_success 'cherry-pick on unborn branch' ' test_expect_success 'cherry-pick "-" to pick from previous branch' ' git checkout unborn && test_commit to-pick actual content && - git checkout master && + git checkout main && git cherry-pick - && echo content >expect && test_cmp expect actual
@@ -135,7 +135,7 @@ test_expect_success 'cherry-pick "-" is meaningless without checkout' ' test_expect_success 'cherry-pick "-" works with arguments' ' git checkout -b side-branch && test_commit change actual change && - git checkout master && + git checkout main && git cherry-pick -s - && echo "Signed-off-by: C O Mitter <[email protected]>" >expect && git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
t/t3502-cherry-pick-merge.sh +2 -2
@@ -8,7 +8,7 @@ test_description='cherry picking and reverting a merge ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -28,7 +28,7 @@ test_expect_success setup ' echo new line >B && git commit -m "add line to B" B && git tag b && - git checkout master && + git checkout main && git merge side && git tag c
t/t3503-cherry-pick-root.sh +6 -6
@@ -2,7 +2,7 @@ test_description='test cherry-picking (and reverting) a root commit' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -33,7 +33,7 @@ test_expect_success setup ' test_expect_success 'cherry-pick a root commit' ' git checkout second^0 && - git cherry-pick master && + git cherry-pick main && echo first >expect && test_cmp expect file1
@@ -41,14 +41,14 @@ test_expect_success 'cherry-pick a root commit' ' test_expect_success 'revert a root commit' ' - git revert master && + git revert main && test_path_is_missing file1 ' test_expect_success 'cherry-pick a root commit with an external strategy' ' - git cherry-pick --strategy=resolve master && + git cherry-pick --strategy=resolve main && echo first >expect && test_cmp expect file1
@@ -56,7 +56,7 @@ test_expect_success 'cherry-pick a root commit with an external strategy' ' test_expect_success 'revert a root commit with an external strategy' ' - git revert --strategy=resolve master && + git revert --strategy=resolve main && test_path_is_missing file1 '
@@ -68,7 +68,7 @@ test_expect_success 'cherry-pick two root commits' ' echo third >expect.file3 && git checkout second^0 && - git cherry-pick master third && + git cherry-pick main third && test_cmp expect.file1 file1 && test_cmp expect.file2 file2 &&
t/t3504-cherry-pick-rerere.sh +13 -13
@@ -2,15 +2,15 @@ test_description='cherry-pick should rerere for conflicts' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh test_expect_success setup ' test_commit foo && - test_commit foo-master foo && - test_commit bar-master bar && + test_commit foo-main foo && + test_commit bar-main bar && git checkout -b dev foo && test_commit foo-dev foo &&
@@ -19,7 +19,7 @@ test_expect_success setup ' ' test_expect_success 'conflicting merge' ' - test_must_fail git merge master + test_must_fail git merge main ' test_expect_success 'fixup' '
@@ -32,7 +32,7 @@ test_expect_success 'fixup' ' ' test_expect_success 'cherry-pick conflict with --rerere-autoupdate' ' - test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master && + test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main && test_cmp foo-expect foo && git diff-files --quiet && test_must_fail git cherry-pick --continue &&
@@ -44,7 +44,7 @@ test_expect_success 'cherry-pick conflict with --rerere-autoupdate' ' test_expect_success 'cherry-pick conflict repsects rerere.autoUpdate' ' test_config rerere.autoUpdate true && - test_must_fail git cherry-pick foo..bar-master && + test_must_fail git cherry-pick foo..bar-main && test_cmp foo-expect foo && git diff-files --quiet && test_must_fail git cherry-pick --continue &&
@@ -56,7 +56,7 @@ test_expect_success 'cherry-pick conflict repsects rerere.autoUpdate' ' test_expect_success 'cherry-pick conflict with --no-rerere-autoupdate' ' test_config rerere.autoUpdate true && - test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-master && + test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-main && test_cmp foo-expect foo && test_must_fail git diff-files --quiet && git add foo &&
@@ -69,7 +69,7 @@ test_expect_success 'cherry-pick conflict with --no-rerere-autoupdate' ' ' test_expect_success 'cherry-pick --continue rejects --rerere-autoupdate' ' - test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master && + test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main && test_cmp foo-expect foo && git diff-files --quiet && test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
@@ -82,25 +82,25 @@ test_expect_success 'cherry-pick --continue rejects --rerere-autoupdate' ' ' test_expect_success 'cherry-pick --rerere-autoupdate more than once' ' - test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-master && + test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-main && test_cmp foo-expect foo && git diff-files --quiet && git cherry-pick --abort && - test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-master && + test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-main && test_cmp foo-expect foo && git diff-files --quiet && git cherry-pick --abort && - test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-master && + test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-main && test_must_fail git diff-files --quiet && git cherry-pick --abort ' test_expect_success 'cherry-pick conflict without rerere' ' test_config rerere.enabled false && - test_must_fail git cherry-pick foo-master && + test_must_fail git cherry-pick foo-main && grep ===== foo && grep foo-dev foo && - grep foo-master foo + grep foo-main foo ' test_done
t/t3505-cherry-pick-empty.sh +13 -13
@@ -2,7 +2,7 @@ test_description='test cherry-picking an empty commit' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -20,7 +20,7 @@ test_expect_success setup ' test_tick && git commit --allow-empty-message -m "" && - git checkout master && + git checkout main && git checkout -b empty-change-branch && test_tick && git commit --allow-empty -m "empty"
@@ -28,7 +28,7 @@ test_expect_success setup ' ' test_expect_success 'cherry-pick an empty commit' ' - git checkout master && + git checkout main && test_expect_code 1 git cherry-pick empty-change-branch '
@@ -38,7 +38,7 @@ test_expect_success 'index lockfile was removed' ' test_expect_success 'cherry-pick a commit with an empty message' ' test_when_finished "git reset --hard empty-message-branch~1" && - git checkout master && + git checkout main && git cherry-pick empty-message-branch '
@@ -47,12 +47,12 @@ test_expect_success 'index lockfile was removed' ' ' test_expect_success 'cherry-pick a commit with an empty message with --allow-empty-message' ' - git checkout -f master && + git checkout -f main && git cherry-pick --allow-empty-message empty-message-branch ' test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' ' - git checkout master && + git checkout main && echo fourth >>file2 && git add file2 && git commit -m "fourth" &&
@@ -60,22 +60,22 @@ test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' ' ' test_expect_success 'cherry pick an empty non-ff commit with --allow-empty' ' - git checkout master && + git checkout main && git cherry-pick --allow-empty empty-change-branch ' test_expect_success 'cherry pick with --keep-redundant-commits' ' - git checkout master && + git checkout main && git cherry-pick --keep-redundant-commits HEAD^ ' test_expect_success 'cherry-pick a commit that becomes no-op (prep)' ' - git checkout master && + git checkout main && git branch fork && echo foo >file2 && git add file2 && test_tick && - git commit -m "add file2 on master" && + git commit -m "add file2 on main" && git checkout fork && echo foo >file2 &&
@@ -87,15 +87,15 @@ test_expect_success 'cherry-pick a commit that becomes no-op (prep)' ' test_expect_success 'cherry-pick a no-op without --keep-redundant' ' git reset --hard && git checkout fork^0 && - test_must_fail git cherry-pick master + test_must_fail git cherry-pick main ' test_expect_success 'cherry-pick a no-op with --keep-redundant' ' git reset --hard && git checkout fork^0 && - git cherry-pick --keep-redundant-commits master && + git cherry-pick --keep-redundant-commits main && git show -s --format=%s >actual && - echo "add file2 on master" >expect && + echo "add file2 on main" >expect && test_cmp expect actual '
t/t3506-cherry-pick-ff.sh +5 -5
@@ -2,7 +2,7 @@ test_description='test cherry-picking with --ff option' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -27,7 +27,7 @@ test_expect_success setup ' ' test_expect_success 'cherry-pick using --ff fast forwards' ' - git checkout master && + git checkout main && git reset --hard first && test_tick && git cherry-pick --ff second &&
@@ -35,7 +35,7 @@ test_expect_success 'cherry-pick using --ff fast forwards' ' ' test_expect_success 'cherry-pick not using --ff does not fast forwards' ' - git checkout master && + git checkout main && git reset --hard first && test_tick && git cherry-pick second &&
@@ -52,7 +52,7 @@ test_expect_success 'cherry-pick not using --ff does not fast forwards' ' # (This has been taken from t3502-cherry-pick-merge.sh) # test_expect_success 'merge setup' ' - git checkout master && + git checkout main && git reset --hard first && echo new line >A && git add A &&
@@ -65,7 +65,7 @@ test_expect_success 'merge setup' ' test_tick && git commit -m "add line to B" B && git tag B && - git checkout master && + git checkout main && git merge side && git tag C && git checkout -b new A
t/t3507-cherry-pick-conflict.sh +2 -2
@@ -9,7 +9,7 @@ test_description='test cherry-pick and revert with conflicts ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -32,7 +32,7 @@ test_expect_success setup ' test_commit redundant-pick foo c redundant && git commit --allow-empty --allow-empty-message && git tag empty && - git checkout master && + git checkout main && git config advice.detachedhead false '
t/t3508-cherry-pick-many-commits.sh +20 -20
@@ -2,7 +2,7 @@ test_description='test cherry-picking many commits' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -34,7 +34,7 @@ test_expect_success setup ' ' test_expect_success 'cherry-pick first..fourth works' ' - git checkout -f master && + git checkout -f main && git reset --hard first && test_tick && git cherry-pick first..fourth &&
@@ -48,7 +48,7 @@ test_expect_success 'cherry-pick three one two works' ' test_commit one && test_commit two && test_commit three && - git checkout -f master && + git checkout -f main && git reset --hard first && git cherry-pick three one two && git diff --quiet three &&
@@ -59,28 +59,28 @@ two" ' test_expect_success 'cherry-pick three one two: fails' ' - git checkout -f master && + git checkout -f main && git reset --hard first && test_must_fail git cherry-pick three one two: ' test_expect_success 'output to keep user entertained during multi-pick' ' cat <<-\EOF >expected && - [master OBJID] second + [main OBJID] second Author: A U Thor <[email protected]> Date: Thu Apr 7 15:14:13 2005 -0700 1 file changed, 1 insertion(+) - [master OBJID] third + [main OBJID] third Author: A U Thor <[email protected]> Date: Thu Apr 7 15:15:13 2005 -0700 1 file changed, 1 insertion(+) - [master OBJID] fourth + [main OBJID] fourth Author: A U Thor <[email protected]> Date: Thu Apr 7 15:16:13 2005 -0700 1 file changed, 1 insertion(+) EOF - git checkout -f master && + git checkout -f main && git reset --hard first && test_tick && git cherry-pick first..fourth >actual &&
@@ -90,7 +90,7 @@ test_expect_success 'output to keep user entertained during multi-pick' ' ' test_expect_success 'cherry-pick --strategy resolve first..fourth works' ' - git checkout -f master && + git checkout -f main && git reset --hard first && test_tick && git cherry-pick --strategy resolve first..fourth &&
@@ -102,23 +102,23 @@ test_expect_success 'cherry-pick --strategy resolve first..fourth works' ' test_expect_success 'output during multi-pick indicates merge strategy' ' cat <<-\EOF >expected && Trying simple merge. - [master OBJID] second + [main OBJID] second Author: A U Thor <[email protected]> Date: Thu Apr 7 15:14:13 2005 -0700 1 file changed, 1 insertion(+) Trying simple merge. - [master OBJID] third + [main OBJID] third Author: A U Thor <[email protected]> Date: Thu Apr 7 15:15:13 2005 -0700 1 file changed, 1 insertion(+) Trying simple merge. - [master OBJID] fourth + [main OBJID] fourth Author: A U Thor <[email protected]> Date: Thu Apr 7 15:16:13 2005 -0700 1 file changed, 1 insertion(+) EOF - git checkout -f master && + git checkout -f main && git reset --hard first && test_tick && git cherry-pick --strategy resolve first..fourth >actual &&
@@ -127,7 +127,7 @@ test_expect_success 'output during multi-pick indicates merge strategy' ' ' test_expect_success 'cherry-pick --ff first..fourth works' ' - git checkout -f master && + git checkout -f main && git reset --hard first && test_tick && git cherry-pick --ff first..fourth &&
@@ -137,7 +137,7 @@ test_expect_success 'cherry-pick --ff first..fourth works' ' ' test_expect_success 'cherry-pick -n first..fourth works' ' - git checkout -f master && + git checkout -f main && git reset --hard first && test_tick && git cherry-pick -n first..fourth &&
@@ -147,7 +147,7 @@ test_expect_success 'cherry-pick -n first..fourth works' ' ' test_expect_success 'revert first..fourth works' ' - git checkout -f master && + git checkout -f main && git reset --hard fourth && test_tick && git revert first..fourth &&
@@ -157,7 +157,7 @@ test_expect_success 'revert first..fourth works' ' ' test_expect_success 'revert ^first fourth works' ' - git checkout -f master && + git checkout -f main && git reset --hard fourth && test_tick && git revert ^first fourth &&
@@ -167,7 +167,7 @@ test_expect_success 'revert ^first fourth works' ' ' test_expect_success 'revert fourth fourth~1 fourth~2 works' ' - git checkout -f master && + git checkout -f main && git reset --hard fourth && test_tick && git revert fourth fourth~1 fourth~2 &&
@@ -177,7 +177,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' ' ' test_expect_success 'cherry-pick -3 fourth works' ' - git checkout -f master && + git checkout -f main && git reset --hard first && test_tick && git cherry-pick -3 fourth &&
@@ -187,7 +187,7 @@ test_expect_success 'cherry-pick -3 fourth works' ' ' test_expect_success 'cherry-pick --stdin works' ' - git checkout -f master && + git checkout -f main && git reset --hard first && test_tick && git rev-list --reverse first..fourth | git cherry-pick --stdin &&
t/t3509-cherry-pick-merge-df.sh +2 -2
@@ -1,7 +1,7 @@ #!/bin/sh test_description='Test cherry-pick with directory/file conflicts' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -31,7 +31,7 @@ test_expect_success 'Setup rename across paths each below D/F conflicts' ' test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' ' git reset --hard && - git checkout master^0 && + git checkout main^0 && git cherry-pick branch '
t/t3512-cherry-pick-submodule.sh +2 -2
@@ -2,7 +2,7 @@ test_description='cherry-pick can handle submodules' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -38,7 +38,7 @@ test_expect_success 'unrelated submodule/file conflict is ignored' ' git add a_file && git commit -m "modify a file" && - git checkout master && + git checkout main && git submodule add ../sub sub && git submodule update sub &&
t/t3600-rm.sh +6 -6
@@ -5,7 +5,7 @@ test_description='Test of the various options to git rm.' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -486,16 +486,16 @@ test_expect_success 'setup submodule conflict' ' echo 1 >nitfol && git add nitfol && git commit -m "added nitfol 1" && - git checkout -b branch2 master && + git checkout -b branch2 main && echo 2 >nitfol && git add nitfol && git commit -m "added nitfol 2" && - git checkout -b conflict1 master && + git checkout -b conflict1 main && git -C submod fetch && git -C submod checkout branch1 && git add submod && git commit -m "submod 1" && - git checkout -b conflict2 master && + git checkout -b conflict2 main && git -C submod checkout branch2 && git add submod && git commit -m "submod 2"
@@ -607,7 +607,7 @@ test_expect_success 'rm of a conflicted unpopulated submodule succeeds' ' ' test_expect_success 'rm of a populated submodule with a .git directory migrates git dir' ' - git checkout -f master && + git checkout -f main && git reset --hard && git submodule update && (
@@ -720,7 +720,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual git checkout HEAD^ && git submodule update && git checkout -q HEAD^ && - git checkout -q master 2>actual && + git checkout -q main 2>actual && test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual && git status -s submod >actual && echo "?? submod/" >expected &&
t/t3701-add-interactive.sh +3 -3
@@ -1,7 +1,7 @@ #!/bin/sh test_description='add -i basic tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -552,8 +552,8 @@ test_expect_success 'patch mode ignores unmerged entries' ' test_commit non-conflict && git checkout -b side && test_commit side conflict.t && - git checkout master && - test_commit master conflict.t && + git checkout main && + test_commit main conflict.t && test_must_fail git merge side && echo changed >non-conflict.t && echo y | git add -p >output &&
t/t3901-i18n-patch.sh +21 -21
168 lines not on this page · raw message
t/t3903-stash.sh +17 -17
@@ -5,7 +5,7 @@ test_description='Test git stash' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -223,14 +223,14 @@ test_expect_success 'stash branch' ' git commit file -m second && git stash branch stashbranch && test refs/heads/stashbranch = $(git symbolic-ref HEAD) && - test $(git rev-parse HEAD) = $(git rev-parse master^) && + test $(git rev-parse HEAD) = $(git rev-parse main^) && git diff --cached >output && diff_cmp expect output && git diff >output && diff_cmp expect1 output && git add file && git commit -m alternate\ second && - git diff master..stashbranch >output && + git diff main..stashbranch >output && diff_cmp output expect2 && test 0 = $(git stash list | wc -l) '
@@ -523,7 +523,7 @@ test_expect_success 'stash branch - no stashes on stack, stash-like argument' ' STASH_ID=$(git stash create) && git reset --hard && git stash branch stash-branch ${STASH_ID} && - test_when_finished "git reset --hard HEAD && git checkout master && + test_when_finished "git reset --hard HEAD && git checkout main && git branch -D stash-branch" && test $(git ls-files --modified | wc -l) -eq 1 '
@@ -539,7 +539,7 @@ test_expect_success 'stash branch - stashes on stack, stash-like argument' ' STASH_ID=$(git stash create) && git reset --hard && git stash branch stash-branch ${STASH_ID} && - test_when_finished "git reset --hard HEAD && git checkout master && + test_when_finished "git reset --hard HEAD && git checkout main && git branch -D stash-branch" && test $(git ls-files --modified | wc -l) -eq 1 '
@@ -741,7 +741,7 @@ test_expect_success 'valid ref of the form "n", n < N' ' git stash && git stash show 0 && git stash branch tmp 0 && - git checkout master && + git checkout main && git stash && git stash apply 0 && git reset --hard &&
@@ -758,7 +758,7 @@ test_expect_success 'branch: do not drop the stash if the branch exists' ' git commit -m initial && echo bar >file && git stash && - test_must_fail git stash branch master stash@{0} && + test_must_fail git stash branch main stash@{0} && git rev-parse stash@{0} -- '
@@ -771,7 +771,7 @@ test_expect_success 'branch: should not drop the stash if the apply fails' ' echo bar >file && git stash && echo baz >file && - test_when_finished "git checkout master" && + test_when_finished "git checkout main" && test_must_fail git stash branch new_branch stash@{0} && git rev-parse stash@{0} -- '
@@ -905,7 +905,7 @@ test_expect_success 'push -m shows right message' ' >foo && git add foo && git stash push -m "test message" && - echo "stash@{0}: On master: test message" >expect && + echo "stash@{0}: On main: test message" >expect && git stash list -1 >actual && test_cmp expect actual '
@@ -914,7 +914,7 @@ test_expect_success 'push -m also works without space' ' >foo && git add foo && git stash push -m"unspaced test message" && - echo "stash@{0}: On master: unspaced test message" >expect && + echo "stash@{0}: On main: unspaced test message" >expect && git stash list -1 >actual && test_cmp expect actual '
@@ -971,7 +971,7 @@ test_expect_success 'push -mfoo uses right message' ' >foo && git add foo && git stash push -m"test mfoo" && - echo "stash@{0}: On master: test mfoo" >expect && + echo "stash@{0}: On main: test mfoo" >expect && git stash list -1 >actual && test_cmp expect actual '
@@ -980,7 +980,7 @@ test_expect_success 'push --message foo is synonym for -mfoo' ' >foo && git add foo && git stash push --message "test message foo" && - echo "stash@{0}: On master: test message foo" >expect && + echo "stash@{0}: On main: test message foo" >expect && git stash list -1 >actual && test_cmp expect actual '
@@ -989,7 +989,7 @@ test_expect_success 'push --message=foo is synonym for -mfoo' ' >foo && git add foo && git stash push --message="test message=foo" && - echo "stash@{0}: On master: test message=foo" >expect && + echo "stash@{0}: On main: test message=foo" >expect && git stash list -1 >actual && test_cmp expect actual '
@@ -998,7 +998,7 @@ test_expect_success 'push -m shows right message' ' >foo && git add foo && git stash push -m "test m foo" && - echo "stash@{0}: On master: test m foo" >expect && + echo "stash@{0}: On main: test m foo" >expect && git stash list -1 >actual && test_cmp expect actual '
@@ -1007,7 +1007,7 @@ test_expect_success 'create stores correct message' ' >foo && git add foo && STASH_ID=$(git stash create "create test message") && - echo "On master: create test message" >expect && + echo "On main: create test message" >expect && git show --pretty=%s -s ${STASH_ID} >actual && test_cmp expect actual '
@@ -1016,13 +1016,13 @@ test_expect_success 'create with multiple arguments for the message' ' >foo && git add foo && STASH_ID=$(git stash create test untracked) && - echo "On master: test untracked" >expect && + echo "On main: test untracked" >expect && git show --pretty=%s -s ${STASH_ID} >actual && test_cmp expect actual ' test_expect_success 'create in a detached state' ' - test_when_finished "git checkout master" && + test_when_finished "git checkout main" && git checkout HEAD~1 && >foo && git add foo &&
t/t3910-mac-os-precompose.sh +4 -4
@@ -5,7 +5,7 @@ test_description='utf-8 decomposed (nfd) converted to precomposed (nfc)' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh
@@ -154,7 +154,7 @@ test_expect_success "git checkout link nfd" ' git checkout l.$Odiarnfd ' test_expect_success "setup case mac2" ' - git checkout master && + git checkout main && git reset --hard && git checkout -b mac_os_2 '
@@ -166,7 +166,7 @@ test_expect_success "commit file d2.Adiarnfd/f.Adiarnfd" ' git commit -m "add d2.$Adiarnfd/f.$Adiarnfd" -- d2.$Adiarnfd/f.$Adiarnfd ' test_expect_success "setup for long decomposed filename" ' - git checkout master && + git checkout main && git reset --hard && git checkout -b mac_os_long_nfd_fn '
@@ -176,7 +176,7 @@ test_expect_success "Add long decomposed filename" ' git commit -m "Long filename" ' test_expect_success "setup for long precomposed filename" ' - git checkout master && + git checkout main && git reset --hard && git checkout -b mac_os_long_nfc_fn '
Signature · 1 line
gitgitgadget