Merge branch 'cb/curl-use-xmalloc'

diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
index 8443966152718ba8bd287016ac4e04f71b15c084..6e61882b6f59c2b66b43e01c753c3a9bb8bbd70e 100755 (executable)
--- a/t/t8014-blame-ignore-fuzzy.sh
+++ b/t/t8014-blame-ignore-fuzzy.sh
@@ -3,9 +3,6 @@
 test_description='git blame ignore fuzzy heuristic'
 . ./test-lib.sh
 
-# short circuit until blame has the fuzzy capabilities
-test_done
-
 pick_author='s/^[0-9a-f^]* *(\([^ ]*\) .*/\1/'
 
 # Each test is composed of 4 variables:
@@ -301,28 +298,28 @@ EOF
 last_test=13
 
 test_expect_success setup '
-       { for i in $(test_seq 2 $last_test)
+       for i in $(test_seq 2 $last_test)
        do
                # Append each line in a separate commit to make it easy to
                # check which original line the blame output relates to.
 
                line_count=0 &&
-               { while IFS= read line
+               while IFS= read line
                do
                        line_count=$((line_count+1)) &&
                        echo "$line" >>"$i" &&
                        git add "$i" &&
                        test_tick &&
                        GIT_AUTHOR_NAME="$line_count" git commit -m "$line_count"
-               done } <"a$i"
-       done } &&
+               done <"a$i"
+       done &&
 
-       { for i in $(test_seq 2 $last_test)
+       for i in $(test_seq 2 $last_test)
        do
                # Overwrite the files with the final content.
                cp b$i $i &&
                git add $i
-       done } &&
+       done &&
        test_tick &&
 
        # Commit the final content all at once so it can all be