t5520: style fixes
Fix style funnies in early part of this test script that checks "git pull" into an unborn branch. The primary change is that 'chdir' to a newly created empty test repository is now protected by being done in a subshell to make it more robust without having to chdir back to the original place. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
00c7e7e7e8
commit
5569113329
@ -9,36 +9,27 @@ modify () {
|
||||
mv "$2.x" "$2"
|
||||
}
|
||||
|
||||
D=`pwd`
|
||||
|
||||
test_expect_success setup '
|
||||
|
||||
echo file >file &&
|
||||
git add file &&
|
||||
git commit -a -m original
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'pulling into void' '
|
||||
mkdir cloned &&
|
||||
cd cloned &&
|
||||
git init &&
|
||||
git pull ..
|
||||
'
|
||||
|
||||
cd "$D"
|
||||
|
||||
test_expect_success 'checking the results' '
|
||||
git init cloned &&
|
||||
(
|
||||
cd cloned &&
|
||||
git pull ..
|
||||
) &&
|
||||
test -f file &&
|
||||
test -f cloned/file &&
|
||||
test_cmp file cloned/file
|
||||
'
|
||||
|
||||
test_expect_success 'pulling into void using master:master' '
|
||||
mkdir cloned-uho &&
|
||||
git init cloned-uho &&
|
||||
(
|
||||
cd cloned-uho &&
|
||||
git init &&
|
||||
git pull .. master:master
|
||||
) &&
|
||||
test -f file &&
|
||||
@ -71,7 +62,6 @@ test_expect_success 'pulling into void does not overwrite staged files' '
|
||||
)
|
||||
'
|
||||
|
||||
|
||||
test_expect_success 'pulling into void does not remove new staged files' '
|
||||
git init cloned-staged-new &&
|
||||
(
|
||||
|
Loading…
Reference in New Issue
Block a user