Skip to content

Commit 80e60bb

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 ac698b8 commit 80e60bb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

t/t5505-remote.sh

Lines changed: 2 additions & 2 deletions
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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ test_expect_success 'fetch with branches' '
969969
mk_empty testrepo &&
970970
git branch second $the_first_commit &&
971971
git checkout second &&
972-
mkdir testrepo/.git/branches &&
972+
mkdir -p testrepo/.git/branches &&
973973
echo ".." > testrepo/.git/branches/branch1 &&
974974
(
975975
cd testrepo &&
@@ -983,7 +983,7 @@ test_expect_success 'fetch with branches' '
983983

984984
test_expect_success 'fetch with branches containing #' '
985985
mk_empty testrepo &&
986-
mkdir testrepo/.git/branches &&
986+
mkdir -p testrepo/.git/branches &&
987987
echo "..#second" > testrepo/.git/branches/branch2 &&
988988
(
989989
cd testrepo &&
@@ -1000,7 +1000,7 @@ test_expect_success 'push with branches' '
10001000
git checkout second &&
10011001
10021002
test_when_finished "rm -rf .git/branches" &&
1003-
mkdir .git/branches &&
1003+
mkdir -p .git/branches &&
10041004
echo "testrepo" > .git/branches/branch1 &&
10051005
10061006
git push branch1 &&
@@ -1016,7 +1016,7 @@ test_expect_success 'push with branches containing #' '
10161016
mk_empty testrepo &&
10171017
10181018
test_when_finished "rm -rf .git/branches" &&
1019-
mkdir .git/branches &&
1019+
mkdir -p .git/branches &&
10201020
echo "testrepo#branch3" > .git/branches/branch2 &&
10211021
10221022
git push branch2 &&

0 commit comments

Comments
 (0)