aboutsummaryrefslogtreecommitdiff
path: root/t/t9101-git-svn-props.sh
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2008-09-10 06:25:28 +0900
committerJunio C Hamano <gitster@pobox.com>2008-09-09 22:59:01 -0700
commitda06a80322a2357b8b5b6ddb8b5648f97ed73e83 (patch)
treefd57124bca273eb7c56f8e128632f95aac7254b7 /t/t9101-git-svn-props.sh
parentf964732c0560743b666ad4e189a6b148dacf6923 (diff)
downloadgit-da06a80322a2357b8b5b6ddb8b5648f97ed73e83.tar.gz
git-da06a80322a2357b8b5b6ddb8b5648f97ed73e83.tar.xz
t9101: use "git hash-object" without dash
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9101-git-svn-props.sh')
-rwxr-xr-xt/t9101-git-svn-props.sh28
1 files changed, 14 insertions, 14 deletions
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 7732dea39..1e31d6ea7 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -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 ..
@@ -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 &&
@@ -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'"