Merge branch 'jk/tree-walk-overflow'

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 48bd3b467d3f32b7a8fda26a7ff04114afde5aa4..e0b3f28d3a96e1b937f4c31e0a3d2e8fb3e6fed5 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -1433,7 +1433,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