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/t1006-cat-file.sh | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh index d8b7f2f..c78bf87 100755 --- a/t/t1006-cat-file.sh +++ b/t/t1006-cat-file.sh @@ -14,7 +14,7 @@ strlen () { maybe_remove_timestamp () { if test -z "$2"; then - echo_without_newline "$1" + echo_without_newline "$1" else echo_without_newline "$(printf '%s\n' "$1" | sed -e 's/ [0-9][0-9]* [-+][0-9][0-9][0-9][0-9]$//')" fi @@ -36,11 +36,11 @@ $content" ' test_expect_success "Type of $type is correct" ' - test $type = "$(git cat-file -t $sha1)" + test $type = "$(git cat-file -t $sha1)" ' test_expect_success "Size of $type is correct" ' - test $size = "$(git cat-file -s $sha1)" + test $size = "$(git cat-file -s $sha1)" ' test -z "$content" || @@ -48,54 +48,54 @@ $content" expect="$(maybe_remove_timestamp "$content" $no_ts)" actual="$(maybe_remove_timestamp "$(git cat-file $type $sha1)" $no_ts)" - if test "z$expect" = "z$actual" + if test "z$expect" = "z$actual" then : happy else echo "Oops: expected $expect" echo "but got $actual" false - fi + fi ' test_expect_success "Pretty content of $type is correct" ' expect="$(maybe_remove_timestamp "$pretty_content" $no_ts)" actual="$(maybe_remove_timestamp "$(git cat-file -p $sha1)" $no_ts)" - if test "z$expect" = "z$actual" + if test "z$expect" = "z$actual" then : happy else echo "Oops: expected $expect" echo "but got $actual" false - fi + fi ' test -z "$content" || test_expect_success "--batch output of $type is correct" ' expect="$(maybe_remove_timestamp "$batch_output" $no_ts)" actual="$(maybe_remove_timestamp "$(echo $sha1 | git cat-file --batch)" $no_ts)" - if test "z$expect" = "z$actual" + if test "z$expect" = "z$actual" then : happy else echo "Oops: expected $expect" echo "but got $actual" false - fi + fi ' test_expect_success "--batch-check output of $type is correct" ' expect="$sha1 $type $size" actual="$(echo_without_newline $sha1 | git cat-file --batch-check)" - if test "z$expect" = "z$actual" + if test "z$expect" = "z$actual" then : happy else echo "Oops: expected $expect" echo "but got $actual" false - fi + fi ' } @@ -184,7 +184,7 @@ test_expect_success "--batch-check for a non-existent hash" ' test "0000000000000000000000000000000000000042 missing 0000000000000000000000000000000000000084 missing" = \ "$( ( echo 0000000000000000000000000000000000000042; - echo_without_newline 0000000000000000000000000000000000000084; ) \ + echo_without_newline 0000000000000000000000000000000000000084; ) \ | git cat-file --batch-check)" ' @@ -193,7 +193,7 @@ test_expect_success "--batch for an existent and a non-existent hash" ' $tag_content 0000000000000000000000000000000000000000 missing" = \ "$( ( echo $tag_sha1; - echo_without_newline 0000000000000000000000000000000000000000; ) \ + echo_without_newline 0000000000000000000000000000000000000000; ) \ | git cat-file --batch)" ' -- 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