git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-21 05:20:18 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master

Browse Source 
ci: avoid d/f conflict in vs/master
This commit is contained in:
Johannes Schindelin
2020-05-09 21:24:56 +02:00
committed by Git for Windows Build Agent
parent e544c8859c 2cc89551f0
commit 960f5be476
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
t/t5505-remote.sh
View File

@@ -951,8 +951,8 @@ test_expect_success '"remote show" does not show symbolic refs' '
( (
cd three && cd three &&
git remote show origin >output && git remote show origin >output &&
! grep "^ *HEAD$" < output && ! grep "^ *HEAD$" <output &&
! grep -i stale < output ! grep -i stale <output
) )
' '
@@ -1155,7 +1155,7 @@ test_expect_success !WITH_BREAKING_CHANGES 'migrate a remote from named file in
( (
cd six && cd six &&
git remote rm origin && git remote rm origin &&
mkdir .git/branches && mkdir -p .git/branches &&
echo "$origin_url#main" >.git/branches/origin && echo "$origin_url#main" >.git/branches/origin &&
git remote rename origin origin && git remote rename origin origin &&
test_path_is_missing .git/branches/origin && test_path_is_missing .git/branches/origin &&
@@ -1170,8 +1170,8 @@ test_expect_success !WITH_BREAKING_CHANGES 'migrate a remote from named file in
( (
cd seven && cd seven &&
git remote rm origin && git remote rm origin &&
mkdir .git/branches && mkdir -p .git/branches &&
echo "quux#foom" > .git/branches/origin && echo "quux#foom" >.git/branches/origin &&
git remote rename origin origin && git remote rename origin origin &&
test_path_is_missing .git/branches/origin && test_path_is_missing .git/branches/origin &&
test "$(git config remote.origin.url)" = "quux" && test "$(git config remote.origin.url)" = "quux" &&

18
t/t5516-fetch-push.sh
View File

@@ -933,8 +933,8 @@ test_expect_success !WITH_BREAKING_CHANGES 'fetch with branches' '
mk_empty testrepo && mk_empty testrepo &&
git branch second $the_first_commit && git branch second $the_first_commit &&
git checkout second && git checkout second &&
mkdir testrepo/.git/branches && mkdir -p testrepo/.git/branches &&
echo ".." > testrepo/.git/branches/branch1 && echo ".." >testrepo/.git/branches/branch1 &&
( (
cd testrepo && cd testrepo &&
git fetch branch1 && git fetch branch1 &&
@@ -947,8 +947,8 @@ test_expect_success !WITH_BREAKING_CHANGES 'fetch with branches' '
test_expect_success !WITH_BREAKING_CHANGES 'fetch with branches containing #' ' test_expect_success !WITH_BREAKING_CHANGES 'fetch with branches containing #' '
mk_empty testrepo && mk_empty testrepo &&
mkdir testrepo/.git/branches && mkdir -p testrepo/.git/branches &&
echo "..#second" > testrepo/.git/branches/branch2 && echo "..#second" >testrepo/.git/branches/branch2 &&
( (
cd testrepo && cd testrepo &&
git fetch branch2 && git fetch branch2 &&
@@ -964,8 +964,8 @@ test_expect_success !WITH_BREAKING_CHANGES 'push with branches' '
git checkout second && git checkout second &&
test_when_finished "rm -rf .git/branches" && test_when_finished "rm -rf .git/branches" &&
mkdir .git/branches && mkdir -p .git/branches &&
echo "testrepo" > .git/branches/branch1 && echo "testrepo" >.git/branches/branch1 &&
git push branch1 && git push branch1 &&
( (
@@ -980,8 +980,8 @@ test_expect_success !WITH_BREAKING_CHANGES 'push with branches containing #' '
mk_empty testrepo && mk_empty testrepo &&
test_when_finished "rm -rf .git/branches" && test_when_finished "rm -rf .git/branches" &&
mkdir .git/branches && mkdir -p .git/branches &&
echo "testrepo#branch3" > .git/branches/branch2 && echo "testrepo#branch3" >.git/branches/branch2 &&
git push branch2 && git push branch2 &&
( (
@@ -1511,7 +1511,7 @@ EOF
git init no-thin && git init no-thin &&
git --git-dir=no-thin/.git config receive.unpacklimit 0 && git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
git push no-thin/.git refs/heads/main:refs/heads/foo && git push no-thin/.git refs/heads/main:refs/heads/foo &&
echo modified >> path1 && echo modified >>path1 &&
git commit -am modified && git commit -am modified &&
git repack -adf && git repack -adf &&
rcvpck="git receive-pack --reject-thin-pack-for-testing" && rcvpck="git receive-pack --reject-thin-pack-for-testing" &&