Merge branch 'en/abort-df-conflict-fixes'

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index af61d083b452c7973a2a703ef35fb57b76af84da..34859fe4a59fdbb48273f4b9e4f16e878b421349 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -1081,7 +1081,7 @@ test_expect_success 'very long name in the index handled sanely' '
        (
                git ls-files -s path4 |
                sed -e "s/      .*/     /" |
-               tr -d "\012"
+               tr -d "\012" &&
                echo "$a"
        ) | git update-index --index-info &&
        len=$(git ls-files "a*" | wc -c) &&