Skip to content

Commit eda1047

Browse files
committed
Merge pull request #2966 from dennisameling/fix-double-exe
Fix double .exe suffixes in CMakeLists.txt
2 parents 1e609cb + 6ea6736 commit eda1047

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

config.mak.uname

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,6 @@ else
669669
NO_GETTEXT =
670670
USE_GETTEXT_SCHEME = fallthrough
671671
USE_LIBPCRE = YesPlease
672-
NO_LIBPCRE1_JIT = UnfortunatelyYes
673672
NO_CURL =
674673
USE_NED_ALLOCATOR = YesPlease
675674
NO_PYTHON =

contrib/buildsystems/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,12 +828,12 @@ install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git-shell${EXE_EXTENS
828828

829829
foreach(b ${git_links})
830830
string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
831-
install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b}${EXE_EXTENSION})")
831+
install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
832832
endforeach()
833833

834834
foreach(b ${git_http_links})
835835
string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
836-
install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-remote-http${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b}${EXE_EXTENSION})")
836+
install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-remote-http${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
837837
endforeach()
838838

839839
install(PROGRAMS ${git_shell_scripts} ${git_perl_scripts} ${CMAKE_BINARY_DIR}/git-p4

t/t7001-mv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ test_expect_success \
108108

109109
test_expect_success \
110110
'adding another file' \
111-
'cp "$TEST_DIRECTORY"/diff-lib/README path0/README &&
111+
'cp "$TEST_DIRECTORY"/diff-lib/README path0/ &&
112112
git add path0/README &&
113113
git commit -m add2 -a'
114114

0 commit comments

Comments
 (0)