diff options
| author |  Jeff King <peff@peff.net> | 2012-06-02 15:03:08 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-06-03 13:11:54 -0700 |
| commit | 745c7c8e6252ba41430a1442e1fa8da2ec40e9c2 (patch) | |
| tree | b0dc93ef1c6e2da4f08a567adffee79cb4007852 | |
| parent | version: add git_user_agent function (diff) | |
| download | tgif-745c7c8e6252ba41430a1442e1fa8da2ec40e9c2.tar.xz | |
http: get default user-agent from git_user_agent
This means we will respect the GIT_USER_AGENT build-time
configuration and run-time environment variable.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | http.c | 3 |
2 files changed, 3 insertions, 5 deletions
@@ -2104,7 +2104,7 @@ configure: configure.ac $(RM) $<+ # These can record GIT_VERSION -version.o git.spec http.o \ +version.o git.spec \ $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ : GIT-VERSION-FILE @@ -2274,9 +2274,6 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \ gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \ -DGIT_LOCALE_PATH='"$(localedir_SQ)"' -http.sp http.s http.o: EXTRA_CPPFLAGS = \ - -DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"' - ifdef NO_EXPAT http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT endif @@ -4,6 +4,7 @@ #include "run-command.h" #include "url.h" #include "credential.h" +#include "version.h" int active_requests; int http_is_verbose; @@ -299,7 +300,7 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_VERBOSE, 1); curl_easy_setopt(result, CURLOPT_USERAGENT, - user_agent ? user_agent : GIT_HTTP_USER_AGENT); + user_agent ? user_agent : git_user_agent()); if (curl_ftp_no_epsv) curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0); |