kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2010-01-12 15:48:38 -08:00
parent a8c37a0e01 8efa5f629e
commit 054d2fa05c
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-grep.c
View File

@ -191,8 +191,6 @@ static int grep_file(struct grep_opt *opt, const char *filename)
error("'%s': %s", filename, strerror(errno)); error("'%s': %s", filename, strerror(errno));
return 0; return 0;
} }
if (!st.st_size)
return 0; /* empty file -- no grep hit */
if (!S_ISREG(st.st_mode)) if (!S_ISREG(st.st_mode))
return 0; return 0;
sz = xsize_t(st.st_size); sz = xsize_t(st.st_size);

2
git-rebase--interactive.sh
View File

@ -322,7 +322,7 @@ make_squash_message () {
} }


peek_next_command () { peek_next_command () {
sed -n "1s/ .*$//p" < "$TODO" sed -n -e "/^#/d" -e "/^$/d" -e "s/ .*//p" -e "q" < "$TODO"
} }


do_next () { do_next () {

2
remote-curl.c
View File

@ -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); strbuf_addf(&buf, "Content-Type: application/x-%s-request", svc);
rpc->hdr_content_type = strbuf_detach(&buf, NULL); 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); rpc->hdr_accept = strbuf_detach(&buf, NULL);


while (!err) { while (!err) {

2
t/t5551-http-fetch.sh
View File

@ -38,7 +38,7 @@ cat >exp <<EOF
> POST /smart/repo.git/git-upload-pack HTTP/1.1 > POST /smart/repo.git/git-upload-pack HTTP/1.1
> Accept-Encoding: deflate, gzip > Accept-Encoding: deflate, gzip
> Content-Type: application/x-git-upload-pack-request > Content-Type: application/x-git-upload-pack-request
> Accept: application/x-git-upload-pack-response > Accept: application/x-git-upload-pack-result
> Content-Length: xxx > Content-Length: xxx
< HTTP/1.1 200 OK < HTTP/1.1 200 OK
< Pragma: no-cache < Pragma: no-cache