summaryrefslogtreecommitdiff
path: root/remote-curl.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-12 23:48:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-12 23:48:38 (GMT)
commit054d2fa05cf0bc55fe1556c9e87d58d67a144f44 (patch)
treeefda16efdfad47941f14d19782d2f1518ef0c75c /remote-curl.c
parenta8c37a0e011d67e3192834a0fffe17452ea57a08 (diff)
parent8efa5f629efb9a8af48619ee90dee02343e0f19d (diff)
downloadgit-054d2fa05cf0bc55fe1556c9e87d58d67a144f44.zip
git-054d2fa05cf0bc55fe1556c9e87d58d67a144f44.tar.gz
git-054d2fa05cf0bc55fe1556c9e87d58d67a144f44.tar.bz2
Merge branch 'maint'
* maint: remote-curl: Fix Accept header for smart HTTP connections grep: -L should show empty files rebase--interactive: Ignore comments and blank lines in peek_next_command
Diffstat (limited to 'remote-curl.c')
-rw-r--r--remote-curl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/remote-curl.c b/remote-curl.c
index 28b2a31..70fdcea 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -510,7 +510,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads)
strbuf_addf(&buf, "Content-Type: application/x-%s-request", svc);
rpc->hdr_content_type = strbuf_detach(&buf, NULL);
- strbuf_addf(&buf, "Accept: application/x-%s-response", svc);
+ strbuf_addf(&buf, "Accept: application/x-%s-result", svc);
rpc->hdr_accept = strbuf_detach(&buf, NULL);
while (!err) {