Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t0021: test application of both crlf and ident
author
Junio C Hamano
<gitster@pobox.com>
Wed, 25 May 2011 01:02:48 +0000
(18:02 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 26 May 2011 23:47:16 +0000
(16:47 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t0021-conversion.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
dd555d8
)
diff --git
a/t/t0021-conversion.sh
b/t/t0021-conversion.sh
index 275421e48ecde787bafba8437ef5977fd153a0e2..f19e6510d04583866e39cbdea545a0d1323b7f76 100755
(executable)
--- 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 \$"
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) &&
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 \$"
echo "\$Id: $id \$"
echo "\$Id: NoTerminatingSymbol"
echo "\$Id: Foreign Commit With Spaces \$"
+ } >expected-output.0 &&
+ {
+ cat expected-output.0 &&
printf "\$Id: NoTerminatingSymbolAtEOF"
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 &&
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
'
# The use of %f in a filter definition is expanded to the path to