]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Makefile: drop support for curl < 7.9.8 (again)
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Mon, 13 Sep 2021 14:51:24 +0000 (16:51 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Sep 2021 17:39:04 +0000 (10:39 -0700)
In 1119a15b5c8 (http: drop support for curl < 7.11.1, 2021-07-30)
support for curl versions older than 7.11.1 was removed, and we
currently require at least version 7.19.4, see 644de29e220 (http: drop
support for curl < 7.19.4, 2021-07-30).

In those changes this Makefile-specific check added in
0890098780f (Decide whether to build http-push in the Makefile,
2005-11-18) was missed, now that we're never going to use such an
ancient curl version we don't need to check that we have at least
7.9.8 here. I have no idea what in http-push.c broke on versions older
than that.

This does not impact "NO_CURL" setups, as this is in the "else" branch
after that check.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile

index 429c276058d3c749c6f4d51ec1d542b71456aa21..378f58b950d8fe49912a36a835e04f979b952d90 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1436,15 +1436,8 @@ else
        REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
        PROGRAM_OBJS += http-fetch.o
        PROGRAMS += $(REMOTE_CURL_NAMES)
-       curl_check := $(shell (echo 070908; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
-       ifeq "$(curl_check)" "070908"
-               ifndef NO_EXPAT
-                       PROGRAM_OBJS += http-push.o
-               else
-                       EXCLUDED_PROGRAMS += git-http-push
-               endif
-       else
-               EXCLUDED_PROGRAMS += git-http-push
+       ifndef NO_EXPAT
+               PROGRAM_OBJS += http-push.o
        endif
        curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
        ifeq "$(curl_check)" "072200"