Skip to content

Commit

Permalink
t9101: use "git hash-object" without dash
Browse files Browse the repository at this point in the history
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Nanako Shiraishi authored and Junio C Hamano committed Sep 10, 2008
1 parent f964732 commit da06a80
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions t/t9101-git-svn-props.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@ cd import
EOF

printf "Hello\r\nWorld\r\n" > crlf
a_crlf=`git-hash-object -w crlf`
a_crlf=`git hash-object -w crlf`
printf "Hello\rWorld\r" > cr
a_cr=`git-hash-object -w cr`
a_cr=`git hash-object -w cr`
printf "Hello\nWorld\n" > lf
a_lf=`git-hash-object -w lf`
a_lf=`git hash-object -w lf`

printf "Hello\r\nWorld" > ne_crlf
a_ne_crlf=`git-hash-object -w ne_crlf`
a_ne_crlf=`git hash-object -w ne_crlf`
printf "Hello\nWorld" > ne_lf
a_ne_lf=`git-hash-object -w ne_lf`
a_ne_lf=`git hash-object -w ne_lf`
printf "Hello\rWorld" > ne_cr
a_ne_cr=`git-hash-object -w ne_cr`
a_ne_cr=`git hash-object -w ne_cr`

touch empty
a_empty=`git-hash-object -w empty`
a_empty=`git hash-object -w empty`
printf "\n" > empty_lf
a_empty_lf=`git-hash-object -w empty_lf`
a_empty_lf=`git hash-object -w empty_lf`
printf "\r" > empty_cr
a_empty_cr=`git-hash-object -w empty_cr`
a_empty_cr=`git hash-object -w empty_cr`
printf "\r\n" > empty_crlf
a_empty_crlf=`git-hash-object -w empty_crlf`
a_empty_crlf=`git hash-object -w empty_crlf`

svn import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null
cd ..
Expand Down Expand Up @@ -103,8 +103,8 @@ done
cd test_wc
printf '$Id$\rHello\rWorld\r' > cr
printf '$Id$\rHello\rWorld' > ne_cr
a_cr=`printf '$Id$\r\nHello\r\nWorld\r\n' | git-hash-object --stdin`
a_ne_cr=`printf '$Id$\r\nHello\r\nWorld' | git-hash-object --stdin`
a_cr=`printf '$Id$\r\nHello\r\nWorld\r\n' | git hash-object --stdin`
a_ne_cr=`printf '$Id$\r\nHello\r\nWorld' | git hash-object --stdin`
test_expect_success 'Set CRLF on cr files' \
'svn propset svn:eol-style CRLF cr &&
svn propset svn:eol-style CRLF ne_cr &&
Expand All @@ -115,8 +115,8 @@ cd ..
test_expect_success 'fetch and pull latest from svn' \
'git svn fetch && git pull . ${remotes_git_svn}'

b_cr="`git-hash-object cr`"
b_ne_cr="`git-hash-object ne_cr`"
b_cr="`git hash-object cr`"
b_ne_cr="`git hash-object ne_cr`"

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

0 comments on commit da06a80

Please sign in to comment.