@matheusbsbs / matheus-bagliano / commits / 2d4032c2fb

Makefile: drop support for curl < 7.9.8 (again)

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>

Ævar Arnfjörð Bjarmason committed Sep 13, 2021 at 16:51 UTC 2d4032c2fb8e38960103649f0a70b48e4feeda36

1 file changed +2 -9

Makefile

+2 -9

@@ -1436,15 +1436,8 @@ else

1436 REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)

1437 PROGRAM_OBJS += http-fetch.o

1438 PROGRAMS += $(REMOTE_CURL_NAMES)

1439 - curl_check := $(shell (echo 070908; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)

1440 - ifeq "$(curl_check)" "070908"

1441 - ifndef NO_EXPAT

1442 - PROGRAM_OBJS += http-push.o

1443 - else

1444 - EXCLUDED_PROGRAMS += git-http-push

1445 - endif

1446 - else

1447 - EXCLUDED_PROGRAMS += git-http-push

1439 + ifndef NO_EXPAT

1440 + PROGRAM_OBJS += http-push.o

1441 endif

1442 curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)

1443 ifeq "$(curl_check)" "072200"