git/http-push.c, branch v1.8.2.2

Allow building with xmlparse.h

2013-02-11T22:33:04Z

expat 1.1 and 1.2 provide xmlparse.h instead of expat.h. Include the former on systems that define the EXPAT_NEEDS_XMLPARSE_H variable and define that variable on QNX systems, which ship with expat 1.1. Signed-off-by: Matt Kraai Signed-off-by: Junio C Hamano

Merge branch 'sp/smart-http-content-type-check'

2013-02-11T04:35:23Z

The smart HTTP clients forgot to verify the content-type that comes back from the server side to make sure that the request is being handled properly. * sp/smart-http-content-type-check: http_request: reset "type" strbuf before adding t5551: fix expected error output Verify Content-Type from smart HTTP servers

Verify Content-Type from smart HTTP servers

2013-02-04T18:22:36Z

Before parsing a suspected smart-HTTP response verify the returned Content-Type matches the standard. This protects a client from attempting to process a payload that smells like a smart-HTTP server response. JGit has been doing this check on all responses since the dawn of time. I mistakenly failed to include it in git-core when smart HTTP was introduced. At the time I didn't know how to get the Content-Type from libcurl. I punted, meant to circle back and fix this, and just plain forgot about it. Signed-off-by: Shawn Pearce Signed-off-by: Junio C Hamano

xml_entities(): use function strbuf_addstr_xml_quoted()

2012-11-26T21:30:52Z

Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

Merge branch 'jc/merge-bases'

2012-09-11T18:36:05Z

Optimise the "merge-base" computation a bit, and also update its users that do not need the full merge-base information to call a cheaper subset. * jc/merge-bases: reduce_heads(): reimplement on top of remove_redundant() merge-base: "--is-ancestor A B" get_merge_bases_many(): walk from many tips in parallel in_merge_bases(): use paint_down_to_common() merge_bases_many(): split out the logic to paint history in_merge_bases(): omit unnecessary redundant common ancestor reduction http-push: use in_merge_bases() for fast-forward check receive-pack: use in_merge_bases() for fast-forward check in_merge_bases(): support only one "other" commit

http-push: use in_merge_bases() for fast-forward check

2012-08-28T01:36:39Z

The original computed merge-base between HEAD and the remote ref and checked if the remote ref is a merge base between them, in order to make sure that we are fast-forwarding. Instead, call in_merge_bases(remote, HEAD) which does the same. Signed-off-by: Junio C Hamano

http-push: do not access git_default_email directly

2012-05-22T16:07:52Z

By calling the ident_default_email accessor, we can be sure that the default value is actually filled-in. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

remove superfluous newlines in error messages

2012-04-30T22:45:51Z

The error handling routines add a newline. Remove the duplicate ones in error messages. Signed-off-by: Pete Wyckoff Signed-off-by: Junio C Hamano

Merge branch 'ab/enable-i18n'

2011-12-20T00:06:41Z

* ab/enable-i18n: i18n: add infrastructure for translating Git with gettext Conflicts: Makefile

http-push: enable "proactive auth"

2011-12-14T00:34:44Z

Before commit 986bbc08, git was proactive about asking for http passwords. It assumed that if you had a username in your URL, you would also want a password, and asked for it before making any http requests. However, this could interfere with the use of .netrc (see 986bbc08 for details). And it was also unnecessary, since the http fetching code had learned to recognize an HTTP 401 and prompt the user then. Furthermore, the proactive prompt could interfere with the usage of .netrc (see 986bbc08 for details). Unfortunately, the http push-over-DAV code never learned to recognize HTTP 401, and so was broken by this change. This patch does a quick fix of re-enabling the "proactive auth" strategy only for http-push, leaving the dumb http fetch and smart-http as-is. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano