This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx>
---
t/t9400-git-cvsserver-server.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 9199550..193d485 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -337,9 +337,9 @@ test_expect_success 'cvs update (subdirectories)' \
filename="file_in_$(echo $dir|sed -e "s#/# #g")" &&
if test "$(echo $(grep -v ^D $dir/CVS/Entries|cut -d/ -f2,3,5))" = "$filename/1.1/" &&
test_cmp "$dir/$filename" "../$dir/$filename"; then
- :
+ :
else
- echo >failure
+ echo >failure
fi
done) &&
test ! -f failure'
@@ -448,7 +448,7 @@ test_expect_success 'cvs update (-p)' '
GIT_CONFIG="$git_config" cvs update &&
rm -f failures &&
for i in merge no-lf empty really-empty; do
- GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out
+ GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out
test_cmp $i.out ../$i >>failures 2>&1
done &&
test -z "$(cat failures)"
--
1.7.6.362.gf0e6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html