Merge branch 'sb/pull-rebase-submodule'

diff --git a/t/t3006-ls-files-long.sh b/t/t3006-ls-files-long.sh
index 202ad658b894875b52f015b3dbeeedb7024904a7..e109c3fbfb5f57c35044299502d1ad406210c998 100755 (executable)
--- a/t/t3006-ls-files-long.sh
+++ b/t/t3006-ls-files-long.sh
@@ -29,7 +29,7 @@ test_expect_success 'overly-long path does not replace another by mistake' '
        printf "$pat" "$blob_a" "$path_a" "$blob_z" "$path_z" |
        git update-index --add --index-info &&
        (
-               echo "$path_a"
+               echo "$path_a" &&
                echo "$path_z"
        ) >expect &&
        git ls-files >actual &&