diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2019-08-07 23:56:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-08 10:22:52 -0700 |
| commit | 1c1f6e03e1fbd92e1785bc21f6974dd036790a44 (patch) | |
| tree | 6d43bde01773389ccb67bd54954abd7068e0287f /t/test-lib-functions.sh | |
| parent | f6c9b474a96edbcacecdc61b3e457027332d8921 (diff) | |
| download | git-1c1f6e03e1fbd92e1785bc21f6974dd036790a44.tar.gz | |
t: decrease nesting in test_oid_to_path
t1410.3 ("corrupt and checks") fails when run using dash versions
before 0.5.8, with a cryptic message:
mv: cannot stat '.git/objects//e84adb2704cbd49549e52169b4043871e13432': No such file or directory
The function generating that path:
test_oid_to_path () {
echo "${1%${1#??}}/${1#??}"
}
which is supposed to produce a result like
12/3456789....
But a dash bug[*] causes it to instead expand to
/3456789...
The stream of symbols that makes up this function is hard for humans
to follow, too. The complexity mostly comes from the repeated use of
the expression ${1#??} for the basename of the loose object. Use a
variable instead --- nowadays, the dialect of shell used by Git
permits local variables, so this is cheap.
An alternative way to work around [*] is to remove the double-quotes
around test_oid_to_path's return value. That makes the expression
easier for dash to read, but harder for humans. Let's prefer the
rephrasing that's helpful for humans, too.
Noticed by building on Ubuntu trusty, which uses dash 0.5.7.
[*] Fixed by v0.5.8~13 ("[EXPAND] Propagate EXP_QPAT in subevalvar, 2013-08-23).
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/test-lib-functions.sh')
| -rw-r--r-- | t/test-lib-functions.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 7860491660..de58e8b502 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1337,7 +1337,8 @@ test_oid () { # Insert a slash into an object ID so it can be used to reference a location # under ".git/objects". For example, "deadbeef..." becomes "de/adbeef..". test_oid_to_path () { - echo "${1%${1#??}}/${1#??}" + local basename=${1#??} + echo "${1%$basename}/$basename" } # Choose a port number based on the test script's number and store it in |