diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-05 09:01:59 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-06 05:37:12 +0400 |
| commit | 1088261f6fc90324014b5306cca4171987da85ce (patch) | |
| tree | 47783a44678fcac8c5ca2165cf0d6fc82be24295 | |
| parent | a2d725b7bdf756ade7680945ebc3fb62e5dd8bcc (diff) | |
git-http-fetch: not a builtin
This splits up git-http-fetch so that it isn't built-in.
It also removes the general dependency on curl, because it is no
longer used by any built-in code. Because they are no longer LIB_OBJS,
add LIB_H to the dependencies of http-related object files, and remove
http.h from the dependencies of transport.o
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | git.c | 3 | ||||
| -rw-r--r-- | http-fetch.c (renamed from builtin-http-fetch.c) | 5 | ||||
| -rw-r--r-- | transport-helper.c | 2 |
4 files changed, 11 insertions, 9 deletions
@@ -980,10 +980,7 @@ else else CURL_LIBCURL = -lcurl endif - BUILTIN_OBJS += builtin-http-fetch.o PROGRAMS += git-remote-http$X git-remote-https$X git-remote-ftp$X git-http-fetch$X - EXTLIBS += $(CURL_LIBCURL) - LIB_OBJS += http.o http-walker.o curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p) ifeq "$(curl_check)" "070908" ifndef NO_EXPAT @@ -1486,8 +1483,13 @@ git-imap-send$X: imap-send.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) -http.o http-walker.o http-push.o transport.o: http.h +http.o http-walker.o http-push.o: http.h +http.o http-walker.o: $(LIB_H) + +git-http-fetch$X: revision.o http.o http-push.o $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ + $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) git-http-push$X: revision.o http.o http-push.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) @@ -309,9 +309,6 @@ static void handle_internal_command(int argc, const char **argv) { "get-tar-commit-id", cmd_get_tar_commit_id }, { "grep", cmd_grep, RUN_SETUP | USE_PAGER }, { "help", cmd_help }, -#ifndef NO_CURL - { "http-fetch", cmd_http_fetch, RUN_SETUP }, -#endif { "init", cmd_init_db }, { "init-db", cmd_init_db }, { "log", cmd_log, RUN_SETUP | USE_PAGER }, diff --git a/builtin-http-fetch.c b/http-fetch.c index f3e63d7206..e8f44babd9 100644 --- a/builtin-http-fetch.c +++ b/http-fetch.c @@ -1,8 +1,9 @@ #include "cache.h" #include "walker.h" -int cmd_http_fetch(int argc, const char **argv, const char *prefix) +int main(int argc, const char **argv) { + const char *prefix; struct walker *walker; int commits_on_stdin = 0; int commits; @@ -18,6 +19,8 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix) int get_verbosely = 0; int get_recover = 0; + prefix = setup_git_directory(); + git_config(git_default_config, NULL); while (arg < argc && argv[arg][0] == '-') { diff --git a/transport-helper.c b/transport-helper.c index c982bb2575..43fdc0a434 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -75,7 +75,7 @@ static int fetch_with_fetch(struct transport *transport, struct strbuf buf = STRBUF_INIT; for (i = 0; i < nr_heads; i++) { - struct ref *posn = to_fetch[i]; + const struct ref *posn = to_fetch[i]; if (posn->status & REF_STATUS_UPTODATE) continue; write_in_full(helper->in, "fetch ", 6); |