@@ -26,10 +26,8 @@ test_expect_success 'init depot' '
2626 line7
2727 line8
2828 EOF
29- cp filek fileko &&
30- sed -i "s/Revision/Revision: do not scrub me/" fileko
31- cp fileko file_text &&
32- sed -i "s/Id/Id: do not scrub me/" file_text
29+ sed "s/Revision/Revision: do not scrub me/" <filek >fileko &&
30+ sed "s/Id/Id: do not scrub me/" <fileko >file_text &&
3331 p4 add -t text+k filek &&
3432 p4 submit -d "filek" &&
3533 p4 add -t text+ko fileko &&
@@ -88,7 +86,8 @@ test_expect_success 'edit far away from RCS lines' '
8886 (
8987 cd "$git" &&
9088 git config git-p4.skipSubmitEdit true &&
91- sed -i "s/^line7/line7 edit/" filek &&
89+ sed "s/^line7/line7 edit/" <filek >filek.tmp &&
90+ mv -f filek.tmp filek &&
9291 git commit -m "filek line7 edit" filek &&
9392 git p4 submit &&
9493 scrub_k_check filek
@@ -105,7 +104,8 @@ test_expect_success 'edit near RCS lines' '
105104 cd "$git" &&
106105 git config git-p4.skipSubmitEdit true &&
107106 git config git-p4.attemptRCSCleanup true &&
108- sed -i "s/^line4/line4 edit/" filek &&
107+ sed "s/^line4/line4 edit/" <filek >filek.tmp &&
108+ mv -f filek.tmp filek &&
109109 git commit -m "filek line4 edit" filek &&
110110 git p4 submit &&
111111 scrub_k_check filek
@@ -122,7 +122,8 @@ test_expect_success 'edit keyword lines' '
122122 cd "$git" &&
123123 git config git-p4.skipSubmitEdit true &&
124124 git config git-p4.attemptRCSCleanup true &&
125- sed -i "/Revision/d" filek &&
125+ sed "/Revision/d" <filek >filek.tmp &&
126+ mv -f filek.tmp filek &&
126127 git commit -m "filek remove Revision line" filek &&
127128 git p4 submit &&
128129 scrub_k_check filek
@@ -139,7 +140,8 @@ test_expect_success 'scrub ko files differently' '
139140 cd "$git" &&
140141 git config git-p4.skipSubmitEdit true &&
141142 git config git-p4.attemptRCSCleanup true &&
142- sed -i "s/^line4/line4 edit/" fileko &&
143+ sed "s/^line4/line4 edit/" <fileko >fileko.tmp &&
144+ mv -f fileko.tmp fileko &&
143145 git commit -m "fileko line4 edit" fileko &&
144146 git p4 submit &&
145147 scrub_ko_check fileko &&
@@ -189,12 +191,14 @@ test_expect_success 'do not scrub plain text' '
189191 cd "$git" &&
190192 git config git-p4.skipSubmitEdit true &&
191193 git config git-p4.attemptRCSCleanup true &&
192- sed -i "s/^line4/line4 edit/" file_text &&
194+ sed "s/^line4/line4 edit/" <file_text >file_text.tmp &&
195+ mv -f file_text.tmp file_text &&
193196 git commit -m "file_text line4 edit" file_text &&
194197 (
195198 cd "$cli" &&
196199 p4 open file_text &&
197- sed -i "s/^line5/line5 p4 edit/" file_text &&
200+ sed "s/^line5/line5 p4 edit/" <file_text >file_text.tmp &&
201+ mv -f file_text.tmp file_text &&
198202 p4 submit -d "file5 p4 edit"
199203 ) &&
200204 echo s | test_expect_code 1 git p4 submit &&
0 commit comments