| Message ID | pull.98.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | .gitattributes: ensure t/oid-info/* has eol=lf | expand |
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes: > The verbose output included these values. Note how '\r' appears in the > variable values. > ... > ++ read tag rest Interesting. "read" does not realize that it is reading from a text file and do whatever appropriate for the platform (i.e. treat CRLF as the end-of-line)? > Derrick Stolee (1): > .gitattributes: ensure t/oid-info/* has eol=lf > > .gitattributes | 1 + > 1 file changed, 1 insertion(+) > base-commit: 5d826e972970a784bd7a7bdf587512510097b8c7 Sounds good. The base is 2.20; the problematic topic was designed to be mergeable to 2.19.x track, but I do not forsee us merging the bc/hash-independent-tests topic to the maintenance track, so for this particular fix, it should be OK to base the fix there.
I noticed that our CI builds (see [1] for an example) were returning success much faster than they did before Git v2.20.0. Turns out that there was a test script failure involving the new test hash logic. error: bug in the test script: bad hash algorithm make[1]: *** [Makefile:56: t0000-basic.sh] Error 1 make[1]: *** Waiting for unfinished jobs.... The reason this passed was because we were running this command in our build: make GIT_TEST_OPTS=--quiet -j 10 -C t || make GIT_TEST_OPTS=\"-i -v -x\" -k -C t failed The first make failed, but the test script did not record any failed tests and hence the second command succeeded. The test bug relates to this function added by 2c02b110d "t: add test functions to translate hash-related values": +# Load key-value pairs from stdin suitable for use with test_oid. Blank lines +# and lines starting with "#" are ignored. Keys must be shell identifier +# characters. +# +# Examples: +# rawsz sha1:20 +# rawsz sha256:32 +test_oid_cache () { + local tag rest k v && + + { test -n "$test_hash_algo" || test_detect_hash; } && + while read tag rest + do + case $tag in + \#*) + continue;; + ?*) + # non-empty + ;; + *) + # blank line + continue;; + esac && + + k="${rest%:*}" && + v="${rest#*:}" && + + if ! expr "$k" : '[a-z0-9][a-z0-9]*$' >/dev/null + then + error 'bug in the test script: bad hash algorithm' + fi && + eval "test_oid_${k}_$tag=\"\$v\"" + done +} The verbose output included these values. Note how '\r' appears in the variable values. ++ test_oid_init ++ test -n '' ++ test_detect_hash ++ test_hash_algo=sha1 ++ test_oid_cache ++ local tag rest k v ++ test -n sha1 ++ read tag rest ++ case $tag in ++ k=sha1 ++ v=$'20\r' ++ expr sha1 : '[a-z0-9][a-z0-9]*$' ++ eval 'test_oid_sha1_rawsz="$v"' +++ test_oid_sha1_rawsz=$'20\r' ++ read tag rest ++ case $tag in ++ k=sha256 ++ v=$'32\r' ++ expr sha256 : '[a-z0-9][a-z0-9]*$' ++ eval 'test_oid_sha256_rawsz="$v"' +++ test_oid_sha256_rawsz=$'32\r' ++ read tag rest ++ case $tag in ++ k= ++ v= ++ expr '' : '[a-z0-9][a-z0-9]*$' [1] https://gvfs.visualstudio.com/ci/_build/results?buildId=4815 Derrick Stolee (1): .gitattributes: ensure t/oid-info/* has eol=lf .gitattributes | 1 + 1 file changed, 1 insertion(+) base-commit: 5d826e972970a784bd7a7bdf587512510097b8c7 Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-98%2Fderrickstolee%2Ftest-oid-fix-windows-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-98/derrickstolee/test-oid-fix-windows-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/98