diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-25 05:02:48 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-27 03:47:16 +0400 |
commit | 6b6cab3f9af2ab7010592e50bb343b990a6a7666 (patch) | |
tree | bab12c3b9f303728996eb86e7af2591b76a24f43 /t/t0021-conversion.sh | |
parent | dd555d8bed255c7949620e6551ea5afd2213bae0 (diff) |
t0021: test application of both crlf and ident
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0021-conversion.sh')
-rwxr-xr-x | t/t0021-conversion.sh | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index 275421e48e..f19e6510d0 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -66,10 +66,14 @@ test_expect_success expanded_in_repo ' echo "\$Id:NoSpaceAtEitherEnd\$" echo "\$Id: NoTerminatingSymbol" echo "\$Id: Foreign Commit With Spaces \$" - printf "\$Id: NoTerminatingSymbolAtEOF" - } > expanded-keywords && + } >expanded-keywords.0 && - git add expanded-keywords && + { + cat expanded-keywords.0 && + printf "\$Id: NoTerminatingSymbolAtEOF" + } >expanded-keywords && + cat expanded-keywords >expanded-keywords-crlf && + git add expanded-keywords expanded-keywords-crlf && git commit -m "File with keywords expanded" && id=$(git rev-parse --verify :expanded-keywords) && @@ -83,15 +87,27 @@ test_expect_success expanded_in_repo ' echo "\$Id: $id \$" echo "\$Id: NoTerminatingSymbol" echo "\$Id: Foreign Commit With Spaces \$" + } >expected-output.0 && + { + cat expected-output.0 && printf "\$Id: NoTerminatingSymbolAtEOF" - } > expected-output && + } >expected-output && + { + append_cr <expected-output.0 && + printf "\$Id: NoTerminatingSymbolAtEOF" + } >expected-output-crlf && + { + echo "expanded-keywords ident" + echo "expanded-keywords-crlf ident text eol=crlf" + } >>.gitattributes && - echo "expanded-keywords ident" >> .gitattributes && + rm -f expanded-keywords expanded-keywords-crlf && - rm -f expanded-keywords && git checkout -- expanded-keywords && - cat expanded-keywords && - cmp expanded-keywords expected-output + test_cmp expanded-keywords expected-output && + + git checkout -- expanded-keywords-crlf && + test_cmp expanded-keywords-crlf expected-output-crlf ' # The use of %f in a filter definition is expanded to the path to |