test fails due to assumed branch name #143
Comments
jmurty
pushed a commit
that referenced
this issue
Jul 9, 2022
|
Fixed in #144 now merged |
jmurty
added a commit
to Erotemic/transcrypt
that referenced
this issue
Jul 9, 2022
# By James Murty (1) and ljm42 (1) * main: Fix date of 2.2.0 release Ensure tests use "main" as default branch name elasticdog#143 # Conflicts: # CHANGELOG.md
jmurty
added a commit
that referenced
this issue
Oct 15, 2022
# By James Murty (18) and others # Via GitHub (1) and James Murty (1) * main: (26 commits) Centralise load and save of password into functions #141 Fix date of 2.2.0 release Ensure tests use "main" as default branch name #143 Use OpenSSL for B64 encoding not `base64` which differs between Linux and Mac #140 Use core attributesFile from worktree (#137) Document `xxd` requirement, and make optional with OpenSSL < 3 (#138) Prepare for 2.2.0 release Fix when using OpenSSL 3 which no longer embeds salt in output (#135) Consolidate all git operation scripts into a single transcrypt script Fix handling of small files and files with null in first 8 bytes (#116) Improve command hint to fix secret files not encrypted in index (#120) (#130) Remove Ubuntu 16.04 LTS from test matrix (#123) Configure default Git branch name for macOS tests in GitHub Handle rename of primary branch from "master" to "main" Ensure Git index is up-to-date before dirty repo check #37 (#109) Fix incorrect salt when partially staged files are commited (#119) Use shorthand for grep options for broader compatibility (#121) Let user set a custom path to openssl #108 Install entire transcrypt script into repository Change version to indicate development "pre-release" status ... # Conflicts: # README.md # tests/_test_helper.bash # tests/test_cleanup.bats # tests/test_crypt.bats # tests/test_init.bats # tests/test_not_inited.bats # transcrypt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
The test
merge: branches with encrypted file - line changes both branches, with conflictsassumes the initial branch is named "main":transcrypt/tests/test_merge.bats
Line 93 in 00a2cbb
That means if you haven't set the defaultBranch, or if you set it to something other than main:
git config --global init.defaultBranch trunkthe test will fail.
A backwards compatible fix is right after this line:
transcrypt/tests/_test_helper.bash
Line 10 in 00a2cbb
add:
git checkout -b mainThis is another option, but it requires a fairly recent version of git:
git init --initial-branch=main "$BATS_TEST_DIRNAME"( thanks to https://stackoverflow.com/a/42871621 )
The text was updated successfully, but these errors were encountered: