diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-12 15:48:38 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-12 15:48:38 -0800 |
commit | 054d2fa05cf0bc55fe1556c9e87d58d67a144f44 (patch) | |
tree | efda16efdfad47941f14d19782d2f1518ef0c75c /t | |
parent | lockfile: show absolute filename in unable_to_lock_message (diff) | |
parent | remote-curl: Fix Accept header for smart HTTP connections (diff) | |
download | tgif-054d2fa05cf0bc55fe1556c9e87d58d67a144f44.tar.xz |
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 't')
-rwxr-xr-x | t/t5551-http-fetch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index c0505ecd7b..7faa31a299 100755 --- a/t/t5551-http-fetch.sh +++ b/t/t5551-http-fetch.sh @@ -38,7 +38,7 @@ cat >exp <<EOF > POST /smart/repo.git/git-upload-pack HTTP/1.1 > Accept-Encoding: deflate, gzip > 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 < HTTP/1.1 200 OK < Pragma: no-cache |