Re: [PATCH 02/13] Use an external program to implement fetching with curl
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 7, 2009, 05:08 UTC
- Message-ID
- <7v63d06wjq.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <alpine.LNX.2.00.0908051145250.2147@iabervon.org>
Daniel Barkalow <barkalow@iabervon.org> writes:
Show 7 quoted lines
> On Wed, 5 Aug 2009, Johannes Schindelin wrote: > >> Ooops, I missed this part. How about making git-remote-https and >> git-remote-ftp hardlinks to git-remote-http? > > Sure. Is "ln ... || ln -s ... || cp ..." the right way to do this > cross-platform?
I've queued the first three from this series to 'next' (and the rest to 'pu'), as I wanted to give wider testing to the smaller footprint git with the libcurl-less-ness they bring in, with Linus's standalone SHA-1.
Since then two fix-ups (adding git-remote-* to .gitignore and the dependency fix to git-http-fetch) were posted to the list, which I also rebased in to the series, making the total number of patches merged to 'next' from the series 5.
If there are major changes/rewrites/redesign in the remaining part of the series that are only in 'pu', please feel free to either send incrementals or replacements.
I do not think I've seen any issues raised but unresolved against the part from this series already in 'next', other than that this builds three copies of git-remote-* programs based on libcurl. I'll rebase a patch like this in after the Makefile fixup ae209bd (http-fetch: Fix Makefile dependancies, 2009-08-06) and queue the result to 'next'.
I suspect that the "install" target may need a patch similar to this one, though...
-- >8 -- Subject: Makefile: do not link three copies of git-remote-* programs
Instead, link only one and make the rest hardlinks/copies, like we do for the built-ins.
Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
Makefile | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile index 2900057..38924f2 100644 --- a/Makefile +++ b/Makefile @@ -1256,6 +1256,7 @@ ifndef V QUIET_LINK = @echo ' ' LINK $@; QUIET_BUILT_IN = @echo ' ' BUILTIN $@; QUIET_GEN = @echo ' ' GEN $@; + QUIET_LNCP = @echo ' ' LN/CP $@; QUIET_SUBDIR0 = +@subdir= QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ $(MAKE) $(PRINT_DIR) -C $$subdir @@ -1494,10 +1495,16 @@ 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) -git-remote-http$X git-remote-https$X git-remote-ftp$X: remote-curl.o http.o http-walker.o $(GITLIBS) +git-remote-http$X: remote-curl.o http.o http-walker.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) +git-remote-https$X git-remote-ftp$X: git-remote-http$X + $(QUIET_LNCP)$(RM) $@ && \ + ln git-remote-http$X $@ 2>/dev/null || \ + ln -s git-remote-http$X $@ 2>/dev/null || \ + cp git-remote-http$X $@ + $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) $(patsubst git-%$X,%.o,$(PROGRAMS)) git.o: $(LIB_H) $(wildcard */*.h) builtin-revert.o wt-status.o: wt-status.h