user/sven/git.git/Makefile, branch v1.7.3.5

Merge branch 'jc/maint-no-openssl-build-fix' into maint

2010-12-14T15:50:20Z

* jc/maint-no-openssl-build-fix: Do not link with -lcrypto under NO_OPENSSL

Merge branch 'tc/http-urls-ends-with-slash' into maint

2010-12-14T15:36:10Z

* tc/http-urls-ends-with-slash: http-fetch: rework url handling http-push: add trailing slash at arg-parse time, instead of later on http-push: check path length before using it http-push: Normalise directory names when pushing to some WebDAV servers http-backend: use end_url_with_slash() url: add str wrapper for end_url_with_slash() shift end_url_with_slash() from http.[ch] to url.[ch] t5550-http-fetch: add test for http-fetch t5550-http-fetch: add missing '&&'

Do not link with -lcrypto under NO_OPENSSL

2010-12-08T22:54:13Z

With 401857c (imap-send: link against libcrypto for HMAC and others, 2010-11-24) we started linking imap-send unconditionally with -lcrypto by mistake; disable this when we are building under NO_OPENSSL. Signed-off-by: Junio C Hamano

shift end_url_with_slash() from http.[ch] to url.[ch]

2010-11-26T22:50:45Z

This allows non-http/curl users to access it too (eg. http-backend.c). Update include headers in end_url_with_slash() users too. Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano

Merge branch 'ab/makefile-track-cc' into maint

2010-11-24T20:44:35Z

* ab/makefile-track-cc: Makefile: add CC to TRACK_CFLAGS

imap-send: link against libcrypto for HMAC and others

2010-11-24T20:23:48Z

When using stricter linkers, such as GNU gold or Darwin ld, transitive dependencies are not counted towards symbol resolution. If we don't link imap-send to libcrypto, we'll have undefined references to the HMAC_*, EVP_* and ERR_* functions families. Signed-off-by: Diego Elio Pettenò Signed-off-by: Junio C Hamano

MinGW: avoid collisions between "tags" and "TAGS"

2010-09-29T20:27:50Z

On case insensitive filesystems, "tags" and "TAGS" target will try to overwrite the same file. Allow MinGW to use "ETAGS" instead. These two targets do produce real files; do not put them on .PHONY target list. Signed-off-by: Junio C Hamano Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Makefile: add CC to TRACK_CFLAGS

2010-09-27T18:45:20Z

Change the git make process so that everything's rebuilt if the CC is changed. Before we wouldn't rebuilt if e.g. the CC variable was changed from gcc to clang. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-09-12T20:53:03Z

* maint: t3101: modernise style compat/nedmalloc: don't force NDEBUG on the rest of git Conflicts: Makefile

compat/nedmalloc: don't force NDEBUG on the rest of git

2010-09-11T17:23:03Z

Define the nedmalloc feature configuration macros for nedmalloc.o, only. This keeps assert(3) working for the rest of the git source; it was turned off for nedmalloc users before by defining NDEBUG globally. Also remove -DUSE_NED_ALLOCATOR as this macro isn't used anywhere. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano