t9101: use "git hash-object" without dash
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nanako Shiraishi committed
Sep 10, 2008 at 06:25 UTC
da06a80322a2357b8b5b6ddb8b5648f97ed73e83
1 file changed
+14
-14
t/t9101-git-svn-props.sh
+14
-14
@@ -26,27 +26,27 @@ cd import
26
EOF
27
28
printf "Hello\r\nWorld\r\n" > crlf
29
- a_crlf=`git-hash-object -w crlf`
29
+ a_crlf=`git hash-object -w crlf`
30
printf "Hello\rWorld\r" > cr
31
- a_cr=`git-hash-object -w cr`
31
+ a_cr=`git hash-object -w cr`
32
printf "Hello\nWorld\n" > lf
33
- a_lf=`git-hash-object -w lf`
33
+ a_lf=`git hash-object -w lf`
34
35
printf "Hello\r\nWorld" > ne_crlf
36
- a_ne_crlf=`git-hash-object -w ne_crlf`
36
+ a_ne_crlf=`git hash-object -w ne_crlf`
37
printf "Hello\nWorld" > ne_lf
38
- a_ne_lf=`git-hash-object -w ne_lf`
38
+ a_ne_lf=`git hash-object -w ne_lf`
39
printf "Hello\rWorld" > ne_cr
40
- a_ne_cr=`git-hash-object -w ne_cr`
40
+ a_ne_cr=`git hash-object -w ne_cr`
41
42
touch empty
43
- a_empty=`git-hash-object -w empty`
43
+ a_empty=`git hash-object -w empty`
44
printf "\n" > empty_lf
45
- a_empty_lf=`git-hash-object -w empty_lf`
45
+ a_empty_lf=`git hash-object -w empty_lf`
46
printf "\r" > empty_cr
47
- a_empty_cr=`git-hash-object -w empty_cr`
47
+ a_empty_cr=`git hash-object -w empty_cr`
48
printf "\r\n" > empty_crlf
49
- a_empty_crlf=`git-hash-object -w empty_crlf`
49
+ a_empty_crlf=`git hash-object -w empty_crlf`
50
51
svn import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null
52
cd ..
@@ -103,8 +103,8 @@ done
103
cd test_wc
104
printf '$Id$\rHello\rWorld\r' > cr
105
printf '$Id$\rHello\rWorld' > ne_cr
106
- a_cr=`printf '$Id$\r\nHello\r\nWorld\r\n' | git-hash-object --stdin`
107
- a_ne_cr=`printf '$Id$\r\nHello\r\nWorld' | git-hash-object --stdin`
106
+ a_cr=`printf '$Id$\r\nHello\r\nWorld\r\n' | git hash-object --stdin`
107
+ a_ne_cr=`printf '$Id$\r\nHello\r\nWorld' | git hash-object --stdin`
108
test_expect_success 'Set CRLF on cr files' \
109
'svn propset svn:eol-style CRLF cr &&
110
svn propset svn:eol-style CRLF ne_cr &&
@@ -115,8 +115,8 @@ cd ..
115
test_expect_success 'fetch and pull latest from svn' \
116
'git svn fetch && git pull . ${remotes_git_svn}'
117
118
-b_cr="`git-hash-object cr`"
119
-b_ne_cr="`git-hash-object ne_cr`"
118
+b_cr="`git hash-object cr`"
119
+b_ne_cr="`git hash-object ne_cr`"
120
121
test_expect_success 'CRLF + $Id$' "test '$a_cr' = '$b_cr'"
122
test_expect_success 'CRLF + $Id$ (no newline)' "test '$a_ne_cr' = '$b_ne_cr'"