@@ -21,32 +21,32 @@ a_empty_cr=
21
21
a_empty_crlf=
22
22
23
23
cd import
24
- cat >> kw.c << \EOF
24
+ cat >> kw.c << \EOF
25
25
/* Somebody prematurely put a keyword into this file */
26
26
/* $Id $ */
27
27
EOF
28
28
29
- printf " Hello\r\nWorld\r\n" > crlf
29
+ printf " Hello\r\nWorld\r\n" > crlf
30
30
a_crlf=$( git hash-object -w crlf)
31
- printf " Hello\rWorld\r" > cr
31
+ printf " Hello\rWorld\r" > cr
32
32
a_cr=$( git hash-object -w cr)
33
- printf " Hello\nWorld\n" > lf
33
+ printf " Hello\nWorld\n" > lf
34
34
a_lf=$( git hash-object -w lf)
35
35
36
- printf " Hello\r\nWorld" > ne_crlf
36
+ printf " Hello\r\nWorld" > ne_crlf
37
37
a_ne_crlf=$( git hash-object -w ne_crlf)
38
- printf " Hello\nWorld" > ne_lf
38
+ printf " Hello\nWorld" > ne_lf
39
39
a_ne_lf=$( git hash-object -w ne_lf)
40
- printf " Hello\rWorld" > ne_cr
40
+ printf " Hello\rWorld" > ne_cr
41
41
a_ne_cr=$( git hash-object -w ne_cr)
42
42
43
43
touch empty
44
44
a_empty=$( git hash-object -w empty)
45
- printf " \n" > empty_lf
45
+ printf " \n" > empty_lf
46
46
a_empty_lf=$( git hash-object -w empty_lf)
47
- printf " \r" > empty_cr
47
+ printf " \r" > empty_cr
48
48
a_empty_cr=$( git hash-object -w empty_cr)
49
- printf " \r\n" > empty_crlf
49
+ printf " \r\n" > empty_crlf
50
50
a_empty_crlf=$( git hash-object -w empty_crlf)
51
51
52
52
svn_cmd import --no-auto-props -m ' import for git svn' . " $svnrepo " > /dev/null
@@ -57,10 +57,10 @@ test_expect_success 'checkout working copy from svn' 'svn co "$svnrepo" test_wc'
57
57
test_expect_success ' setup some commits to svn' '
58
58
(
59
59
cd test_wc &&
60
- echo Greetings >> kw.c &&
60
+ echo Greetings >>kw.c &&
61
61
poke kw.c &&
62
62
svn_cmd commit -m "Not yet an Id" &&
63
- echo Hello world >> kw.c &&
63
+ echo Hello world >>kw.c &&
64
64
poke kw.c &&
65
65
svn_cmd commit -m "Modified file, but still not yet an Id" &&
66
66
svn_cmd propset svn:keywords Id kw.c &&
@@ -75,7 +75,7 @@ test_expect_success 'fetch revisions from svn' 'git svn fetch'
75
75
name=' test svn:keywords ignoring'
76
76
test_expect_success " $name " \
77
77
' git checkout -b mybranch remotes/git-svn &&
78
- echo Hi again >> kw.c &&
78
+ echo Hi again >>kw.c &&
79
79
git commit -a -m "test keywords ignoring" &&
80
80
git svn set-tree remotes/git-svn..mybranch &&
81
81
git pull . remotes/git-svn'
106
106
107
107
108
108
cd test_wc
109
- printf ' $Id$\rHello\rWorld\r' > cr
110
- printf ' $Id$\rHello\rWorld' > ne_cr
109
+ printf ' $Id$\rHello\rWorld\r' > cr
110
+ printf ' $Id$\rHello\rWorld' > ne_cr
111
111
a_cr=$( printf ' $Id$\r\nHello\r\nWorld\r\n' | git hash-object --stdin)
112
112
a_ne_cr=$( printf ' $Id$\r\nHello\r\nWorld' | git hash-object --stdin)
113
113
test_expect_success ' Set CRLF on cr files' \
@@ -126,7 +126,7 @@ b_ne_cr="$(git hash-object ne_cr)"
126
126
test_expect_success ' CRLF + $Id$' " test '$a_cr ' = '$b_cr '"
127
127
test_expect_success ' CRLF + $Id$ (no newline)' " test '$a_ne_cr ' = '$b_ne_cr '"
128
128
129
- cat > show-ignore.expect << \EOF
129
+ cat > show-ignore.expect << \EOF
130
130
131
131
# /
132
132
/no-such-file*
@@ -153,7 +153,7 @@ no-such-file*
153
153
' . &&
154
154
svn_cmd commit -m 'propset svn:ignore'
155
155
) &&
156
- git svn show-ignore > show-ignore.got &&
156
+ git svn show-ignore >show-ignore.got &&
157
157
cmp show-ignore.expect show-ignore.got
158
158
"
159
159
0 commit comments