Skip to content

Commit e30c25a

Browse files
dschodscho
committed
Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
Merge this early to resolve merge conflicts early. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2 parents 84dac4b + 8bb50a1 commit e30c25a

File tree

4 files changed

+28
-26
lines changed

4 files changed

+28
-26
lines changed

‎config.mak.uname‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ vcxproj:
755755

756756
# Make .vcxproj files and add them
757757
perl contrib/buildsystems/generate -g Vcxproj
758-
git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
758+
git add -f git.sln {*,*/lib.proj,t/helper/*}/*.vcxproj
759759

760760
# Generate the LinkOrCopyBuiltins.targets and LinkOrCopyRemoteHttp.targets file
761761
(echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
@@ -765,16 +765,16 @@ vcxproj:
765765
echo ' <Copy SourceFiles="$$(OutDir)\git.exe" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
766766
done && \
767767
echo ' </Target>' && \
768-
echo '</Project>') >git/LinkOrCopyBuiltins.targets
768+
echo '</Project>') >git.proj/LinkOrCopyBuiltins.targets
769769
(echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
770770
echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
771771
for name in $(REMOTE_CURL_ALIASES); \
772772
do \
773773
echo ' <Copy SourceFiles="$$(OutDir)\'"$(REMOTE_CURL_PRIMARY)"'" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
774774
done && \
775775
echo ' </Target>' && \
776-
echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
777-
git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
776+
echo '</Project>') >git-remote-http.proj/LinkOrCopyRemoteHttp.targets
777+
git add -f git.proj/LinkOrCopyBuiltins.targets git-remote-http.proj/LinkOrCopyRemoteHttp.targets
778778

779779
# Add generated headers
780780
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(GENERATED_H)

‎contrib/buildsystems/Generators/Vcxproj.pm‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ sub createProject {
5858
my $uuid = generate_guid($name);
5959
$$build_structure{"$prefix${target}_GUID"} = $uuid;
6060
my $vcxproj = $target;
61-
$vcxproj =~ s/(.*\/)?(.*)/$&\/$2.vcxproj/;
62-
$vcxproj =~ s/([^\/]*)(\/lib)\/(lib.vcxproj)/$1$2\/$1_$3/;
61+
$vcxproj =~ s/(.*\/)?(.*)/$&.proj\/$2.vcxproj/;
62+
$vcxproj =~ s/([^\/]*)(\/lib\.proj)\/(lib.vcxproj)/$1$2\/$1_$3/;
6363
$$build_structure{"$prefix${target}_VCXPROJ"} = $vcxproj;
6464

6565
my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"$prefix${name}_SOURCES"}}));
@@ -89,7 +89,9 @@ sub createProject {
8989
$defines =~ s/>/&gt;/g;
9090
$defines =~ s/\'//g;
9191

92-
die "Could not create the directory $target for $label project!\n" unless (-d "$target" || mkdir "$target");
92+
my $dir = $vcxproj;
93+
$dir =~ s/\/[^\/]*$//;
94+
die "Could not create the directory $dir for $label project!\n" unless (-d "$dir" || mkdir "$dir");
9395

9496
open F, ">$vcxproj" or die "Could not open $vcxproj for writing!\n";
9597
binmode F, ":crlf :utf8";
@@ -237,7 +239,7 @@ EOM
237239

238240
print F << "EOM";
239241
<ItemGroup>
240-
<ProjectReference Include="$cdup\\libgit\\libgit.vcxproj">
242+
<ProjectReference Include="$cdup\\libgit.proj\\libgit.vcxproj">
241243
<Project>$uuid_libgit</Project>
242244
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
243245
</ProjectReference>
@@ -252,7 +254,7 @@ EOM
252254
}
253255
if (!($name =~ 'xdiff')) {
254256
print F << "EOM";
255-
<ProjectReference Include="$cdup\\xdiff\\lib\\xdiff_lib.vcxproj">
257+
<ProjectReference Include="$cdup\\xdiff\\lib.proj\\xdiff_lib.vcxproj">
256258
<Project>$uuid_xdiff_lib</Project>
257259
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
258260
</ProjectReference>
@@ -261,7 +263,7 @@ EOM
261263
if ($name =~ /(test-(line-buffer|svn-fe)|^git-remote-testsvn)\.exe$/) {
262264
my $uuid_vcs_svn_lib = $$build_structure{"LIBS_vcs-svn/lib_GUID"};
263265
print F << "EOM";
264-
<ProjectReference Include="$cdup\\vcs-svn\\lib\\vcs-svn_lib.vcxproj">
266+
<ProjectReference Include="$cdup\\vcs-svn\\lib.proj\\vcs-svn_lib.vcxproj">
265267
<Project>$uuid_vcs_svn_lib</Project>
266268
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
267269
</ProjectReference>
@@ -338,7 +340,7 @@ sub createGlueProject {
338340
my $vcxproj = $build_structure{"APPS_${appname}_VCXPROJ"};
339341
$vcxproj =~ s/\//\\/g;
340342
$appname =~ s/.*\///;
341-
print F "\"${appname}\", \"${vcxproj}\", \"${uuid}\"";
343+
print F "\"${appname}.proj\", \"${vcxproj}\", \"${uuid}\"";
342344
print F "$SLN_POST";
343345
}
344346
foreach (@libs) {
@@ -348,7 +350,7 @@ sub createGlueProject {
348350
my $vcxproj = $build_structure{"LIBS_${libname}_VCXPROJ"};
349351
$vcxproj =~ s/\//\\/g;
350352
$libname =~ s/\//_/g;
351-
print F "\"${libname}\", \"${vcxproj}\", \"${uuid}\"";
353+
print F "\"${libname}.proj\", \"${vcxproj}\", \"${uuid}\"";
352354
print F "$SLN_POST";
353355
}
354356

‎t/t5505-remote.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -835,8 +835,8 @@ test_expect_success '"remote show" does not show symbolic refs' '
835835
(
836836
cd three &&
837837
git remote show origin >output &&
838-
! grep "^ *HEAD$" < output &&
839-
! grep -i stale < output
838+
! grep "^ *HEAD$" <output &&
839+
! grep -i stale <output
840840
)
841841
'
842842

@@ -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,8 +1054,8 @@ 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 &&
1058-
echo "quux#foom" > .git/branches/origin &&
1057+
mkdir -p .git/branches &&
1058+
echo "quux#foom" >.git/branches/origin &&
10591059
git remote rename origin origin &&
10601060
test_path_is_missing .git/branches/origin &&
10611061
test "$(git config remote.origin.url)" = "quux" &&

‎t/t5516-fetch-push.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -946,8 +946,8 @@ 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 &&
950-
echo ".." > testrepo/.git/branches/branch1 &&
949+
mkdir -p testrepo/.git/branches &&
950+
echo ".." >testrepo/.git/branches/branch1 &&
951951
(
952952
cd testrepo &&
953953
git fetch branch1 &&
@@ -960,8 +960,8 @@ test_expect_success 'fetch with branches' '
960960

961961
test_expect_success 'fetch with branches containing #' '
962962
mk_empty testrepo &&
963-
mkdir testrepo/.git/branches &&
964-
echo "..#second" > testrepo/.git/branches/branch2 &&
963+
mkdir -p testrepo/.git/branches &&
964+
echo "..#second" >testrepo/.git/branches/branch2 &&
965965
(
966966
cd testrepo &&
967967
git fetch branch2 &&
@@ -977,8 +977,8 @@ test_expect_success 'push with branches' '
977977
git checkout second &&
978978
979979
test_when_finished "rm -rf .git/branches" &&
980-
mkdir .git/branches &&
981-
echo "testrepo" > .git/branches/branch1 &&
980+
mkdir -p .git/branches &&
981+
echo "testrepo" >.git/branches/branch1 &&
982982
983983
git push branch1 &&
984984
(
@@ -993,8 +993,8 @@ test_expect_success 'push with branches containing #' '
993993
mk_empty testrepo &&
994994
995995
test_when_finished "rm -rf .git/branches" &&
996-
mkdir .git/branches &&
997-
echo "testrepo#branch3" > .git/branches/branch2 &&
996+
mkdir -p .git/branches &&
997+
echo "testrepo#branch3" >.git/branches/branch2 &&
998998
999999
git push branch2 &&
10001000
(
@@ -1523,7 +1523,7 @@ EOF
15231523
git init no-thin &&
15241524
git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
15251525
git push no-thin/.git refs/heads/main:refs/heads/foo &&
1526-
echo modified >> path1 &&
1526+
echo modified >>path1 &&
15271527
git commit -am modified &&
15281528
git repack -adf &&
15291529
rcvpck="git receive-pack --reject-thin-pack-for-testing" &&

0 commit comments

Comments
 (0)