Skip to content

Commit 05a4287

Browse files
committed
SQUASH??? test_config cannot be used inside a subshell
1 parent 17b7e84 commit 05a4287

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t5505-remote.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -734,10 +734,10 @@ test_expect_success 'reject adding remote with an invalid name' '
734734
# the last two ones check if the config is updated.
735735

736736
test_expect_success 'rename a remote' '
737+
test_config_global remote.pushDefault origin &&
737738
git clone one four &&
738739
(
739740
cd four &&
740-
test_config_global remote.pushDefault origin &&
741741
git config branch.master.pushRemote origin &&
742742
git remote rename origin upstream &&
743743
test -z "$(git for-each-ref refs/remotes/origin)" &&
@@ -761,10 +761,10 @@ test_expect_success 'rename a remote renames repo remote.pushDefault' '
761761
'
762762

763763
test_expect_success 'rename a remote renames repo remote.pushDefault but ignores global' '
764+
test_config_global remote.pushDefault other &&
764765
git clone one four.2 &&
765766
(
766767
cd four.2 &&
767-
test_config_global remote.pushDefault other &&
768768
git config remote.pushDefault origin &&
769769
git remote rename origin upstream &&
770770
test "$(git config --global remote.pushDefault)" = "other" &&
@@ -773,10 +773,10 @@ test_expect_success 'rename a remote renames repo remote.pushDefault but ignores
773773
'
774774

775775
test_expect_success 'rename a remote renames repo remote.pushDefault but keeps global' '
776+
test_config_global remote.pushDefault origin &&
776777
git clone one four.3 &&
777778
(
778779
cd four.3 &&
779-
test_config_global remote.pushDefault origin &&
780780
git config remote.pushDefault origin &&
781781
git remote rename origin upstream &&
782782
test "$(git config --global remote.pushDefault)" = "origin" &&
@@ -823,10 +823,10 @@ test_expect_success 'rename succeeds with existing remote.<target>.prune' '
823823
'
824824

825825
test_expect_success 'remove a remote' '
826+
test_config_global remote.pushDefault origin &&
826827
git clone one four.five &&
827828
(
828829
cd four.five &&
829-
test_config_global remote.pushDefault origin &&
830830
git config branch.master.pushRemote origin &&
831831
git remote remove origin &&
832832
test -z "$(git for-each-ref refs/remotes/origin)" &&
@@ -847,10 +847,10 @@ test_expect_success 'remove a remote removes repo remote.pushDefault' '
847847
'
848848

849849
test_expect_success 'remove a remote removes repo remote.pushDefault but ignores global' '
850+
test_config_global remote.pushDefault other &&
850851
git clone one four.five.2 &&
851852
(
852853
cd four.five.2 &&
853-
test_config_global remote.pushDefault other &&
854854
git config remote.pushDefault origin &&
855855
git remote remove origin &&
856856
test "$(git config --global remote.pushDefault)" = "other" &&
@@ -859,10 +859,10 @@ test_expect_success 'remove a remote removes repo remote.pushDefault but ignores
859859
'
860860

861861
test_expect_success 'remove a remote removes repo remote.pushDefault but keeps global' '
862+
test_config_global remote.pushDefault origin &&
862863
git clone one four.five.3 &&
863864
(
864865
cd four.five.3 &&
865-
test_config_global remote.pushDefault origin &&
866866
git config remote.pushDefault origin &&
867867
git remote remove origin &&
868868
test "$(git config --global remote.pushDefault)" = "origin" &&

0 commit comments

Comments
 (0)