Fix use of "perl -i" on Windows
The perldiag(1) has following to say about this: "Can't do inplace edit without backup" (F) You're on a system such as MS-DOS that gets confused if you try reading from a deleted (but still opened) file. You have to say -i.bak, or some such. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alex Riesen committed
Jun 25, 2008 at 20:35 UTC
3015fa5846c19e79f99c1d6a49fd2510ed9291b8
3 files changed
+8
-8
t/t5303-pack-corruption-resilience.sh
+2
-2
@@ -90,7 +90,7 @@ test_expect_success \
90
'create_new_pack &&
91
git prune-packed &&
92
chmod +w ${pack}.pack &&
93
- perl -i -pe "s/ base /abcdef/" ${pack}.pack &&
93
+ perl -i.bak -pe "s/ base /abcdef/" ${pack}.pack &&
94
test_must_fail git cat-file blob $blob_1 > /dev/null &&
95
test_must_fail git cat-file blob $blob_2 > /dev/null &&
96
test_must_fail git cat-file blob $blob_3 > /dev/null'
@@ -138,7 +138,7 @@ test_expect_success \
138
'create_new_pack &&
139
git prune-packed &&
140
chmod +w ${pack}.pack &&
141
- perl -i -pe "s/ delta1 /abcdefgh/" ${pack}.pack &&
141
+ perl -i.bak -pe "s/ delta1 /abcdefgh/" ${pack}.pack &&
142
git cat-file blob $blob_1 > /dev/null &&
143
test_must_fail git cat-file blob $blob_2 > /dev/null &&
144
test_must_fail git cat-file blob $blob_3 > /dev/null'
t/t9106-git-svn-dcommit-clobber-series.sh
+4
-4
@@ -20,8 +20,8 @@ test_expect_success '(supposedly) non-conflicting change from SVN' '
20
test x"`sed -n -e 61p < file`" = x61 &&
21
svn co "$svnrepo" tmp &&
22
cd tmp &&
23
- perl -i -p -e "s/^58$/5588/" file &&
24
- perl -i -p -e "s/^61$/6611/" file &&
23
+ perl -i.bak -p -e "s/^58$/5588/" file &&
24
+ perl -i.bak -p -e "s/^61$/6611/" file &&
25
poke file &&
26
test x"`sed -n -e 58p < file`" = x5588 &&
27
test x"`sed -n -e 61p < file`" = x6611 &&
@@ -40,8 +40,8 @@ test_expect_success 'some unrelated changes to git' "
40
test_expect_success 'change file but in unrelated area' "
41
test x\"\`sed -n -e 4p < file\`\" = x4 &&
42
test x\"\`sed -n -e 7p < file\`\" = x7 &&
43
- perl -i -p -e 's/^4\$/4444/' file &&
44
- perl -i -p -e 's/^7\$/7777/' file &&
43
+ perl -i.bak -p -e 's/^4\$/4444/' file &&
44
+ perl -i.bak -p -e 's/^7\$/7777/' file &&
45
test x\"\`sed -n -e 4p < file\`\" = x4444 &&
46
test x\"\`sed -n -e 7p < file\`\" = x7777 &&
47
git commit -m '4 => 4444, 7 => 7777' file &&
templates/hooks--prepare-commit-msg.sample
+2
-2
@@ -22,10 +22,10 @@
22
23
case "$2,$3" in
24
merge,)
25
- perl -i -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
25
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
26
27
# ,|template,)
28
-# perl -i -pe '
28
+# perl -i.bak -pe '
29
# print "\n" . `git diff --cached --name-status -r`
30
# if /^#/ && $first++ == 0' "$1" ;;
31