mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
t3701: use test_write_lines and write_script
Simplify things slightly by using the above helpers. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e4d671c6a6
commit
11489a6539
1 changed files with 5 additions and 28 deletions
|
@ -87,13 +87,8 @@ test_expect_success 'setup expected' '
|
|||
EOF
|
||||
'
|
||||
|
||||
test_expect_success 'setup fake editor' '
|
||||
>fake_editor.sh &&
|
||||
chmod a+x fake_editor.sh &&
|
||||
test_set_editor "$(pwd)/fake_editor.sh"
|
||||
'
|
||||
|
||||
test_expect_success 'dummy edit works' '
|
||||
test_set_editor : &&
|
||||
(echo e; echo a) | git add -p &&
|
||||
git diff > diff &&
|
||||
test_cmp expected diff
|
||||
|
@ -110,12 +105,10 @@ test_expect_success 'setup patch' '
|
|||
'
|
||||
|
||||
test_expect_success 'setup fake editor' '
|
||||
echo "#!$SHELL_PATH" >fake_editor.sh &&
|
||||
cat >>fake_editor.sh <<-\EOF &&
|
||||
write_script "fake_editor.sh" <<-\EOF &&
|
||||
mv -f "$1" oldpatch &&
|
||||
mv -f patch "$1"
|
||||
EOF
|
||||
chmod a+x fake_editor.sh &&
|
||||
test_set_editor "$(pwd)/fake_editor.sh"
|
||||
'
|
||||
|
||||
|
@ -302,18 +295,12 @@ test_expect_success 'deleting an empty file' '
|
|||
|
||||
test_expect_success 'split hunk setup' '
|
||||
git reset --hard &&
|
||||
for i in 10 20 30 40 50 60
|
||||
do
|
||||
echo $i
|
||||
done >test &&
|
||||
test_write_lines 10 20 30 40 50 60 >test &&
|
||||
git add test &&
|
||||
test_tick &&
|
||||
git commit -m test &&
|
||||
|
||||
for i in 10 15 20 21 22 23 24 30 40 50 60
|
||||
do
|
||||
echo $i
|
||||
done >test
|
||||
test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
|
||||
'
|
||||
|
||||
test_expect_success 'split hunk "add -p (edit)"' '
|
||||
|
@ -334,17 +321,7 @@ test_expect_success 'split hunk "add -p (edit)"' '
|
|||
'
|
||||
|
||||
test_expect_failure 'split hunk "add -p (no, yes, edit)"' '
|
||||
cat >test <<-\EOF &&
|
||||
5
|
||||
10
|
||||
20
|
||||
21
|
||||
30
|
||||
31
|
||||
40
|
||||
50
|
||||
60
|
||||
EOF
|
||||
test_write_lines 5 10 20 21 30 31 40 50 60 >test &&
|
||||
git reset &&
|
||||
# test sequence is s(plit), n(o), y(es), e(dit)
|
||||
# q n q q is there to make sure we exit at the end.
|
||||
|
|
Loading…
Reference in a new issue