delta/git.git/http-push.c, branch jk/robustify-parse-commit

http-push.c::add_send_request(): do not initialize transfer_request

2013-07-19T18:15:17+00:00

That pointer will be assigned to new memory via

    request = xmalloc(sizeof(*request));

20 lines later unconditionally anyway, so it's safe to not assign it
to an arbitrary variable.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

http: drop http_error function

2013-04-07T01:56:46+00:00

This function is a single-liner and is only called from one
place. Just inline it, which makes the code more obvious.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

http: simplify http_error helper function

2013-04-07T01:56:44+00:00

This helper function should really be a one-liner that
prints an error message, but it has ended up unnecessarily
complicated:

  1. We call error() directly when we fail to start the curl
     request, so we must later avoid printing a duplicate
     error in http_error().

     It would be much simpler in this case to just stuff the
     error message into our usual curl_errorstr buffer
     rather than printing it ourselves. This means that
     http_error does not even have to care about curl's exit
     value (the interesting part is in the errorstr buffer
     already).

  2. We return the "ret" value passed in to us, but none of
     the callers actually cares about our return value. We
     can just drop this entirely.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Allow building with xmlparse.h

2013-02-11T22:33:04+00:00

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:23+00:00

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:36+00:00

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:52+00:00

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

Merge branch 'jc/merge-bases'

2012-09-11T18:36:05+00:00

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:39+00:00

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:52+00:00

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