Skip to content

Commit da06a80

Browse files
Nanako Shiraishigitster
authored andcommitted
t9101: use "git hash-object" without dash
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f964732 commit da06a80

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

t/t9101-git-svn-props.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,27 @@ cd import
2626
EOF
2727

2828
printf "Hello\r\nWorld\r\n" > crlf
29-
a_crlf=`git-hash-object -w crlf`
29+
a_crlf=`git hash-object -w crlf`
3030
printf "Hello\rWorld\r" > cr
31-
a_cr=`git-hash-object -w cr`
31+
a_cr=`git hash-object -w cr`
3232
printf "Hello\nWorld\n" > lf
33-
a_lf=`git-hash-object -w lf`
33+
a_lf=`git hash-object -w lf`
3434

3535
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`
3737
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`
3939
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`
4141

4242
touch empty
43-
a_empty=`git-hash-object -w empty`
43+
a_empty=`git hash-object -w empty`
4444
printf "\n" > empty_lf
45-
a_empty_lf=`git-hash-object -w empty_lf`
45+
a_empty_lf=`git hash-object -w empty_lf`
4646
printf "\r" > empty_cr
47-
a_empty_cr=`git-hash-object -w empty_cr`
47+
a_empty_cr=`git hash-object -w empty_cr`
4848
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`
5050

5151
svn import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null
5252
cd ..
@@ -103,8 +103,8 @@ done
103103
cd test_wc
104104
printf '$Id$\rHello\rWorld\r' > cr
105105
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`
108108
test_expect_success 'Set CRLF on cr files' \
109109
'svn propset svn:eol-style CRLF cr &&
110110
svn propset svn:eol-style CRLF ne_cr &&
@@ -115,8 +115,8 @@ cd ..
115115
test_expect_success 'fetch and pull latest from svn' \
116116
'git svn fetch && git pull . ${remotes_git_svn}'
117117

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`"
120120

121121
test_expect_success 'CRLF + $Id$' "test '$a_cr' = '$b_cr'"
122122
test_expect_success 'CRLF + $Id$ (no newline)' "test '$a_ne_cr' = '$b_ne_cr'"

0 commit comments

Comments
 (0)