Skip to content

Commit 91e35b9

Browse files
committed
t5505/t5516: allow running without .git/branches/ in the templates
When we commit the template directory as part of `make vcxproj`, the `branches/` directory is not actually commited, as it is empty. Two tests were not prepared for that situation. This developer tried to get rid of the support for `.git/branches/` a long time ago, but that effort did not bear fruit, so the best we can do is work around in these here tests. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent ceef40c commit 91e35b9

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

t/t5505-remote.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
10391039
(
10401040
cd six &&
10411041
git remote rm origin &&
1042-
mkdir .git/branches &&
1042+
mkdir -p .git/branches &&
10431043
echo "$origin_url#main" >.git/branches/origin &&
10441044
git remote rename origin origin &&
10451045
test_path_is_missing .git/branches/origin &&
@@ -1054,7 +1054,7 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/branches (2)'
10541054
(
10551055
cd seven &&
10561056
git remote rm origin &&
1057-
mkdir .git/branches &&
1057+
mkdir -p .git/branches &&
10581058
echo "quux#foom" > .git/branches/origin &&
10591059
git remote rename origin origin &&
10601060
test_path_is_missing .git/branches/origin &&

t/t5516-fetch-push.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ test_expect_success 'fetch with branches' '
946946
mk_empty testrepo &&
947947
git branch second $the_first_commit &&
948948
git checkout second &&
949-
mkdir testrepo/.git/branches &&
949+
mkdir -p testrepo/.git/branches &&
950950
echo ".." > testrepo/.git/branches/branch1 &&
951951
(
952952
cd testrepo &&
@@ -960,7 +960,7 @@ test_expect_success 'fetch with branches' '
960960

961961
test_expect_success 'fetch with branches containing #' '
962962
mk_empty testrepo &&
963-
mkdir testrepo/.git/branches &&
963+
mkdir -p testrepo/.git/branches &&
964964
echo "..#second" > testrepo/.git/branches/branch2 &&
965965
(
966966
cd testrepo &&
@@ -977,7 +977,7 @@ test_expect_success 'push with branches' '
977977
git checkout second &&
978978
979979
test_when_finished "rm -rf .git/branches" &&
980-
mkdir .git/branches &&
980+
mkdir -p .git/branches &&
981981
echo "testrepo" > .git/branches/branch1 &&
982982
983983
git push branch1 &&
@@ -993,7 +993,7 @@ test_expect_success 'push with branches containing #' '
993993
mk_empty testrepo &&
994994
995995
test_when_finished "rm -rf .git/branches" &&
996-
mkdir .git/branches &&
996+
mkdir -p .git/branches &&
997997
echo "testrepo#branch3" > .git/branches/branch2 &&
998998
999999
git push branch2 &&

0 commit comments

Comments
 (0)