Skip to content

Commit 2456374

Browse files
dschogitster
authored andcommitted
cmake/vcxproj: stop special-casing remote-ext
When the `vcxproj` target was introduced in `config.mak.uname` to allow building Git with the Visual C toolchain, the `git remote-ext` command was always executed in its dashed form. Therefore, it was impossible to pass the test suite unless that command existed in its dashed form, and we had to special-case this. Later, when the `vcxproj` target got out of fashion because Visual Studio gained native support for CMake builds, this special-casing was copied without questioning it. But as of 675df19 (transport-helper: do not run git-remote-ext etc. in dashed form, 2020-08-26), the reason for this special-casing no longer exists. So let's just drop it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 1c01f0f commit 2456374

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

config.mak.uname

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -819,10 +819,6 @@ vcxproj:
819819
sed -i 's|\(git\)-\([-a-z]*\)\.exe"|\1.exe" \2|g' \
820820
bin-wrappers/git-{receive-pack,upload-archive}
821821
git add -f $(test_bindir_programs)
822-
# remote-ext is a builtin, but invoked as if it were external
823-
sed 's|receive-pack|remote-ext|g' \
824-
<bin-wrappers/git-receive-pack >bin-wrappers/git-remote-ext
825-
git add -f bin-wrappers/git-remote-ext
826822

827823
# Add templates
828824
$(MAKE) -C templates

contrib/buildsystems/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ endif()
10821082

10831083
#wrapper scripts
10841084
set(wrapper_scripts
1085-
git git-upload-pack git-receive-pack git-upload-archive git-shell git-remote-ext scalar)
1085+
git git-upload-pack git-receive-pack git-upload-archive git-shell scalar)
10861086

10871087
set(wrapper_test_scripts
10881088
test-fake-ssh test-tool)

0 commit comments

Comments
 (0)