Browse Source

tests: mark tests relying on the current default for `init.defaultBranch`

In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.

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

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

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

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

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

This trick was performed by this command:

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

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

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

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

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

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 4 years ago committed by Junio C Hamano
parent
commit
334afbc76f
  1. 2
      ci/run-build-and-tests.sh
  2. 3
      t/t0002-gitfile.sh
  3. 3
      t/t0020-crlf.sh
  4. 3
      t/t0021-conversion.sh
  5. 3
      t/t0028-working-tree-encoding.sh
  6. 3
      t/t0041-usage.sh
  7. 3
      t/t0050-filesystem.sh
  8. 3
      t/t0100-previous.sh
  9. 3
      t/t1004-read-tree-m-u-wf.sh
  10. 3
      t/t1008-read-tree-overlay.sh
  11. 3
      t/t1009-read-tree-new-index.sh
  12. 3
      t/t1021-rerere-in-workdir.sh
  13. 3
      t/t1090-sparse-checkout-scope.sh
  14. 3
      t/t1091-sparse-checkout-builtin.sh
  15. 3
      t/t1300-config.sh
  16. 3
      t/t1301-shared-repo.sh
  17. 3
      t/t1400-update-ref.sh
  18. 3
      t/t1403-show-ref.sh
  19. 3
      t/t1405-main-ref-store.sh
  20. 3
      t/t1406-submodule-ref-store.sh
  21. 3
      t/t1407-worktree-ref-store.sh
  22. 3
      t/t1408-packed-refs.sh
  23. 3
      t/t1410-reflog.sh
  24. 3
      t/t1411-reflog-show.sh
  25. 3
      t/t1413-reflog-detach.sh
  26. 3
      t/t1414-reflog-walk.sh
  27. 3
      t/t1416-ref-transaction-hooks.sh
  28. 3
      t/t1430-bad-ref-name.sh
  29. 3
      t/t1500-rev-parse.sh
  30. 3
      t/t1503-rev-parse-verify.sh
  31. 3
      t/t1505-rev-parse-last.sh
  32. 3
      t/t1506-rev-parse-diagnosis.sh
  33. 3
      t/t1507-rev-parse-upstream.sh
  34. 3
      t/t1508-at-combinations.sh
  35. 3
      t/t1511-rev-parse-caret.sh
  36. 3
      t/t1512-rev-parse-disambiguation.sh
  37. 3
      t/t1513-rev-parse-prefix.sh
  38. 3
      t/t1514-rev-parse-push.sh
  39. 3
      t/t1700-split-index.sh
  40. 3
      t/t2007-checkout-symlink.sh
  41. 3
      t/t2009-checkout-statinfo.sh
  42. 3
      t/t2010-checkout-ambiguous.sh
  43. 3
      t/t2011-checkout-invalid-head.sh
  44. 3
      t/t2012-checkout-last.sh
  45. 3
      t/t2015-checkout-unborn.sh
  46. 3
      t/t2017-checkout-orphan.sh
  47. 3
      t/t2020-checkout-detach.sh
  48. 3
      t/t2022-checkout-paths.sh
  49. 3
      t/t2023-checkout-m.sh
  50. 3
      t/t2027-checkout-track.sh
  51. 3
      t/t2030-unresolve-info.sh
  52. 3
      t/t2060-switch.sh
  53. 3
      t/t2070-restore.sh
  54. 3
      t/t2400-worktree-add.sh
  55. 3
      t/t2401-worktree-prune.sh
  56. 3
      t/t2402-worktree-list.sh
  57. 3
      t/t2405-worktree-submodule.sh
  58. 3
      t/t3200-branch.sh
  59. 3
      t/t3201-branch-contains.sh
  60. 3
      t/t3202-show-branch-octopus.sh
  61. 3
      t/t3203-branch-output.sh
  62. 3
      t/t3204-branch-name-interpretation.sh
  63. 3
      t/t3205-branch-color.sh
  64. 3
      t/t3206-range-diff.sh
  65. 3
      t/t3210-pack-refs.sh
  66. 3
      t/t3211-peel-ref.sh
  67. 3
      t/t3302-notes-index-expensive.sh
  68. 3
      t/t3303-notes-subtrees.sh
  69. 3
      t/t3304-notes-mixed.sh
  70. 3
      t/t3320-notes-merge-worktrees.sh
  71. 3
      t/t3400-rebase.sh
  72. 3
      t/t3402-rebase-merge.sh
  73. 3
      t/t3403-rebase-skip.sh
  74. 3
      t/t3404-rebase-interactive.sh
  75. 3
      t/t3405-rebase-malformed.sh
  76. 3
      t/t3406-rebase-message.sh
  77. 3
      t/t3407-rebase-abort.sh
  78. 3
      t/t3408-rebase-multi-line.sh
  79. 3
      t/t3409-rebase-preserve-merges.sh
  80. 3
      t/t3412-rebase-root.sh
  81. 3
      t/t3413-rebase-hook.sh
  82. 3
      t/t3415-rebase-autosquash.sh
  83. 3
      t/t3416-rebase-onto-threedots.sh
  84. 3
      t/t3418-rebase-continue.sh
  85. 3
      t/t3419-rebase-patch-id.sh
  86. 3
      t/t3420-rebase-autostash.sh
  87. 3
      t/t3427-rebase-subtree.sh
  88. 3
      t/t3430-rebase-merges.sh
  89. 3
      t/t3431-rebase-fork-point.sh
  90. 3
      t/t3432-rebase-fast-forward.sh
  91. 3
      t/t3434-rebase-i18n.sh
  92. 3
      t/t3435-rebase-gpg-sign.sh
  93. 3
      t/t3500-cherry.sh
  94. 3
      t/t3501-revert-cherry-pick.sh
  95. 3
      t/t3502-cherry-pick-merge.sh
  96. 3
      t/t3503-cherry-pick-root.sh
  97. 3
      t/t3504-cherry-pick-rerere.sh
  98. 3
      t/t3505-cherry-pick-empty.sh
  99. 3
      t/t3506-cherry-pick-ff.sh
  100. 3
      t/t3507-cherry-pick-conflict.sh
  101. Some files were not shown because too many files have changed in this diff Show More

2
ci/run-build-and-tests.sh

@ -13,6 +13,7 @@ esac @@ -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) @@ -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)

3
t/t0002-gitfile.sh

@ -4,6 +4,9 @@ test_description='.git file @@ -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() {

3
t/t0020-crlf.sh

@ -2,6 +2,9 @@ @@ -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() {

3
t/t0021-conversion.sh

@ -2,6 +2,9 @@ @@ -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"

3
t/t0028-working-tree-encoding.sh

@ -2,6 +2,9 @@ @@ -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

3
t/t0041-usage.sh

@ -2,6 +2,9 @@ @@ -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 ' '

3
t/t0050-filesystem.sh

@ -2,6 +2,9 @@ @@ -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')

3
t/t0100-previous.sh

@ -2,6 +2,9 @@ @@ -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}' '

3
t/t1004-read-tree-m-u-wf.sh

@ -2,6 +2,9 @@ @@ -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


3
t/t1008-read-tree-overlay.sh

@ -2,6 +2,9 @@ @@ -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


3
t/t1009-read-tree-new-index.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t1021-rerere-in-workdir.sh

@ -1,6 +1,9 @@ @@ -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 '

3
t/t1090-sparse-checkout-scope.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t1091-sparse-checkout-builtin.sh

@ -2,6 +2,9 @@ @@ -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() {

3
t/t1300-config.sh

@ -5,6 +5,9 @@ @@ -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' '

3
t/t1301-shared-repo.sh

@ -5,6 +5,9 @@ @@ -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.

3
t/t1400-update-ref.sh

@ -4,6 +4,9 @@ @@ -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

3
t/t1403-show-ref.sh

@ -1,6 +1,9 @@ @@ -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 '

3
t/t1405-main-ref-store.sh

@ -2,6 +2,9 @@ @@ -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"

3
t/t1406-submodule-ref-store.sh

@ -2,6 +2,9 @@ @@ -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"

3
t/t1407-worktree-ref-store.sh

@ -2,6 +2,9 @@ @@ -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"

3
t/t1408-packed-refs.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t1410-reflog.sh

@ -4,6 +4,9 @@ @@ -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 () {

3
t/t1411-reflog-show.sh

@ -1,6 +1,9 @@ @@ -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' '

3
t/t1413-reflog-detach.sh

@ -1,6 +1,9 @@ @@ -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 () {

3
t/t1414-reflog-walk.sh

@ -1,6 +1,9 @@ @@ -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' '

3
t/t1416-ref-transaction-hooks.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t1430-bad-ref-name.sh

@ -1,6 +1,9 @@ @@ -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 '

3
t/t1500-rev-parse.sh

@ -1,6 +1,9 @@ @@ -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

3
t/t1503-rev-parse-verify.sh

@ -6,6 +6,9 @@ test_description='test git rev-parse --verify' @@ -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()

3
t/t1505-rev-parse-last.sh

@ -2,6 +2,9 @@ @@ -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



3
t/t1506-rev-parse-diagnosis.sh

@ -4,6 +4,9 @@ test_description='test git rev-parse diagnosis for invalid argument' @@ -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 ()

3
t/t1507-rev-parse-upstream.sh

@ -2,6 +2,9 @@ @@ -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



3
t/t1508-at-combinations.sh

@ -1,6 +1,9 @@ @@ -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() {

3
t/t1511-rev-parse-caret.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t1512-rev-parse-disambiguation.sh

@ -20,6 +20,9 @@ one tagged as v1.0.0. They all have one regular file each. @@ -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

3
t/t1513-rev-parse-prefix.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t1514-rev-parse-push.sh

@ -1,6 +1,9 @@ @@ -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 () {

3
t/t1700-split-index.sh

@ -2,6 +2,9 @@ @@ -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

3
t/t2007-checkout-symlink.sh

@ -4,6 +4,9 @@ @@ -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 '

3
t/t2009-checkout-statinfo.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t2010-checkout-ambiguous.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t2011-checkout-invalid-head.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t2012-checkout-last.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t2015-checkout-unborn.sh

@ -1,6 +1,9 @@ @@ -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' '

3
t/t2017-checkout-orphan.sh

@ -7,6 +7,9 @@ test_description='git checkout --orphan @@ -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

3
t/t2020-checkout-detach.sh

@ -1,6 +1,9 @@ @@ -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 () {

3
t/t2022-checkout-paths.sh

@ -1,6 +1,9 @@ @@ -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 '

3
t/t2023-checkout-m.sh

@ -4,6 +4,9 @@ test_description='checkout -m -- <conflicted path> @@ -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 '

3
t/t2027-checkout-track.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t2030-unresolve-info.sh

@ -2,6 +2,9 @@ @@ -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 () {

3
t/t2060-switch.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t2070-restore.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t2400-worktree-add.sh

@ -2,6 +2,9 @@ @@ -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

3
t/t2401-worktree-prune.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t2402-worktree-list.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t2405-worktree-submodule.sh

@ -2,6 +2,9 @@ @@ -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)

3
t/t3200-branch.sh

@ -5,6 +5,9 @@ @@ -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


3
t/t3201-branch-contains.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t3202-show-branch-octopus.sh

@ -2,6 +2,9 @@ @@ -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"

3
t/t3203-branch-output.sh

@ -1,6 +1,9 @@ @@ -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


3
t/t3204-branch-name-interpretation.sh

@ -6,6 +6,9 @@ Branch name arguments are usually names which are taken to be inside of @@ -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() {

3
t/t3205-branch-color.sh

@ -1,6 +1,9 @@ @@ -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' '

3
t/t3206-range-diff.sh

@ -2,6 +2,9 @@ @@ -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

3
t/t3210-pack-refs.sh

@ -9,6 +9,9 @@ test_description='git pack-refs should not change the branch semantic @@ -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' '

3
t/t3211-peel-ref.sh

@ -1,6 +1,9 @@ @@ -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' '

3
t/t3302-notes-index-expensive.sh

@ -5,6 +5,9 @@ @@ -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 () {

3
t/t3303-notes-subtrees.sh

@ -2,6 +2,9 @@ @@ -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

3
t/t3304-notes-mixed.sh

@ -2,6 +2,9 @@ @@ -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

3
t/t3320-notes-merge-worktrees.sh

@ -5,6 +5,9 @@ @@ -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' '

3
t/t3400-rebase.sh

@ -8,6 +8,9 @@ test_description='git rebase assorted tests @@ -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

3
t/t3402-rebase-merge.sh

@ -5,6 +5,9 @@ @@ -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

3
t/t3403-rebase-skip.sh

@ -5,6 +5,9 @@ @@ -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

3
t/t3404-rebase-interactive.sh

@ -25,6 +25,9 @@ Initial setup: @@ -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

3
t/t3405-rebase-malformed.sh

@ -2,6 +2,9 @@ @@ -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


3
t/t3406-rebase-message.sh

@ -2,6 +2,9 @@ @@ -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' '

3
t/t3407-rebase-abort.sh

@ -2,6 +2,9 @@ @@ -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

3
t/t3408-rebase-multi-line.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t3409-rebase-preserve-merges.sh

@ -6,6 +6,9 @@ test_description='git rebase -p should preserve merges @@ -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

3
t/t3412-rebase-root.sh

@ -4,6 +4,9 @@ test_description='git rebase --root @@ -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 () {

3
t/t3413-rebase-hook.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t3415-rebase-autosquash.sh

@ -2,6 +2,9 @@ @@ -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

3
t/t3416-rebase-onto-threedots.sh

@ -2,6 +2,9 @@ @@ -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"


3
t/t3418-rebase-continue.sh

@ -2,6 +2,9 @@ @@ -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

3
t/t3419-rebase-patch-id.sh

@ -2,6 +2,9 @@ @@ -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 () {

3
t/t3420-rebase-autostash.sh

@ -4,6 +4,9 @@ @@ -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 '

3
t/t3427-rebase-subtree.sh

@ -4,6 +4,9 @@ test_description='git rebase tests for -Xsubtree @@ -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


3
t/t3430-rebase-merges.sh

@ -18,6 +18,9 @@ Initial setup: @@ -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

3
t/t3431-rebase-fork-point.sh

@ -5,6 +5,9 @@ @@ -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)

3
t/t3432-rebase-fast-forward.sh

@ -5,6 +5,9 @@ @@ -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 '

3
t/t3434-rebase-i18n.sh

@ -14,6 +14,9 @@ Initial setup: @@ -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 () {

3
t/t3435-rebase-gpg-sign.sh

@ -5,6 +5,9 @@ @@ -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"

3
t/t3500-cherry.sh

@ -8,6 +8,9 @@ test_description='git cherry should detect patches integrated upstream @@ -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

3
t/t3501-revert-cherry-pick.sh

@ -10,6 +10,9 @@ test_description='test cherry-pick and revert with renames @@ -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 '

3
t/t3502-cherry-pick-merge.sh

@ -8,6 +8,9 @@ test_description='cherry picking and reverting a merge @@ -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 '

3
t/t3503-cherry-pick-root.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t3504-cherry-pick-rerere.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t3505-cherry-pick-empty.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t3506-cherry-pick-ff.sh

@ -2,6 +2,9 @@ @@ -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 '

3
t/t3507-cherry-pick-conflict.sh

@ -9,6 +9,9 @@ test_description='test cherry-pick and revert with conflicts @@ -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 () {

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save