From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Dec 2011 19:32:37 +0000 (-0800)
Subject: Merge branch 'jk/maint-push-over-dav' into maint
X-Git-Tag: v1.7.8.2~14
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f1c12e1b4af2eec4eefff9350b74601b36f51d85;p=git-core%2Fgit.git

Merge branch 'jk/maint-push-over-dav' into maint

* jk/maint-push-over-dav:
  http-push: enable "proactive auth"
  t5540: test DAV push with authentication
---

f1c12e1b4af2eec4eefff9350b74601b36f51d85
diff --cc http.h
index ee1606942,51f6ba73b..0b6165389
--- a/http.h
+++ b/http.h
@@@ -85,9 -86,11 +85,10 @@@ extern void add_fill_function(void *dat
  extern void step_active_slots(void);
  #endif
  
- extern void http_init(struct remote *remote, const char *url);
+ extern void http_init(struct remote *remote, const char *url,
+ 		      int proactive_auth);
  extern void http_cleanup(void);
  
 -extern int data_received;
  extern int active_requests;
  extern int http_is_verbose;
  extern size_t http_post_buffer;