summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-11-29 15:41:50 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-29 15:41:50 -0800
commitad1260b6c994f7c0f9c259bd39f39979f7f4ecc2 (patch)
tree178477065b014826267a1f39a8447a4ac58c0949 /contrib
parentMerge branch 'tb/plug-pack-bitmap-leaks' (diff)
parentgit-sh-setup: remove "sane_grep", it's not needed anymore (diff)
downloadtgif-ad1260b6c994f7c0f9c259bd39f39979f7f4ecc2.tar.xz
Merge branch 'ab/sh-retire-helper-functions'
Make a few helper functions unused and then lose them. * ab/sh-retire-helper-functions: git-sh-setup: remove "sane_grep", it's not needed anymore git-sh-setup: remove unused sane_egrep() function git-instaweb: unconditionally assume that gitweb is mod_perl capable Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES) Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES) Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/buildsystems/CMakeLists.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index fd1399c440..86b4611446 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -781,7 +781,6 @@ foreach(script ${git_shell_scripts})
string(REPLACE "@@USE_GETTEXT_SCHEME@@" "" content "${content}")
string(REPLACE "# @@BROKEN_PATH_FIX@@" "" content "${content}")
string(REPLACE "@@PERL@@" "${PERL_PATH}" content "${content}")
- string(REPLACE "@@SANE_TEXT_GREP@@" "-a" content "${content}")
string(REPLACE "@@PAGER_ENV@@" "LESS=FRX LV=-c" content "${content}")
file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
endforeach()