From 934d9cfb93a84de96816d0050cb09ada2d905e8e Mon Sep 17 00:00:00 2001 From: zwPapEr Date: Fri, 26 Jun 2015 16:18:39 +0800 Subject: [PATCH 1/3] fixed number error in transfer-protocols example --- .../sections/transfer-protocols.asc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/book/10-git-internals/sections/transfer-protocols.asc b/book/10-git-internals/sections/transfer-protocols.asc index c3c0b9a87..15636140f 100644 --- a/book/10-git-internals/sections/transfer-protocols.asc +++ b/book/10-git-internals/sections/transfer-protocols.asc @@ -144,10 +144,9 @@ It tries to run a command on the remote server via an SSH call that looks someth [source,console] ---- $ ssh -x git@server "git-receive-pack 'simplegit-progit.git'" -005bca82a6dff817ec66f4437202690a93763949 refs/heads/master report-status \ +00a5ca82a6dff817ec66f4437202690a93763949 refs/heads/masterreport-status \ delete-refs side-band-64k quiet ofs-delta \ agent=git/2:2.1.1+github-607-gfba4028 delete-refs -003e085bb3bcb608e1e84b2432f8ecbe6306e7e7 refs/heads/topic 0000 ---- @@ -165,9 +164,9 @@ For instance, if you're updating the `master` branch and adding an `experiment` [source] ---- -0085ca82a6dff817ec66f44342007202690a93763949 15027957951b64cf874c3557a0f3547bd83b3ff6 \ +0076ca82a6dff817ec66f44342007202690a93763949 15027957951b64cf874c3557a0f3547bd83b3ff6 \ refs/heads/master report-status -00670000000000000000000000000000000000000000 cdfdb42577e2506715f8cfeacdbabc092bf63e8d \ +006c0000000000000000000000000000000000000000 cdfdb42577e2506715f8cfeacdbabc092bf63e8d \ refs/heads/experiment 0000 ---- @@ -182,7 +181,7 @@ Finally, the server responds with a success (or failure) indication: [source] ---- -000Aunpack ok +000eunpack ok ---- ====== HTTP(S) @@ -234,7 +233,7 @@ After `fetch-pack` connects, `upload-pack` sends back something like this: side-band side-band-64k ofs-delta shallow no-progress include-tag \ multi_ack_detailed symref=HEAD:refs/heads/master \ agent=git/2:2.1.1+github-607-gfba4028 -003fca82a6dff817ec66f44342007202690a93763949 refs/heads/master +003fe2409a098dc3e53539a9028a94b6224db9d6a6b6 refs/heads/master 0000 ---- @@ -247,7 +246,7 @@ At the end of this list, it writes ``done'' to initiate the `upload-pack` proces [source] ---- -0054want ca82a6dff817ec66f44342007202690a93763949 ofs-delta +003cwant ca82a6dff817ec66f44342007202690a93763949 ofs-delta 0032have 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7 0000 0009done From 418db6a83a54c6620e7da8fbb3f3c3b90494fae4 Mon Sep 17 00:00:00 2001 From: zwPapEr Date: Sat, 27 Jun 2015 15:01:29 +0800 Subject: [PATCH 2/3] add white space to indicate 0x00 --- book/10-git-internals/sections/transfer-protocols.asc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/book/10-git-internals/sections/transfer-protocols.asc b/book/10-git-internals/sections/transfer-protocols.asc index 15636140f..d534f4e98 100644 --- a/book/10-git-internals/sections/transfer-protocols.asc +++ b/book/10-git-internals/sections/transfer-protocols.asc @@ -144,7 +144,7 @@ It tries to run a command on the remote server via an SSH call that looks someth [source,console] ---- $ ssh -x git@server "git-receive-pack 'simplegit-progit.git'" -00a5ca82a6dff817ec66f4437202690a93763949 refs/heads/masterreport-status \ +00a5ca82a6dff817ec66f4437202690a93763949 refs/heads/master□report-status \ delete-refs side-band-64k quiet ofs-delta \ agent=git/2:2.1.1+github-607-gfba4028 delete-refs 0000 @@ -193,8 +193,8 @@ The connection is initiated with this request: ---- => GET http://server/simplegit-progit.git/info/refs?service=git-receive-pack 001f# service=git-receive-pack -000000ab6c5f0e45abd7832bf23074a333f739977c9e8188 refs/heads/master \ - report-status delete-refs side-band-64k quiet ofs-delta \ +00ab6c5f0e45abd7832bf23074a333f739977c9e8188 refs/heads/master□report-status \ + delete-refs side-band-64k quiet ofs-delta \ agent=git/2:2.1.1~vmg-bitmaps-bugaloo-608-g116744e 0000 ---- @@ -229,7 +229,7 @@ After `fetch-pack` connects, `upload-pack` sends back something like this: [source] ---- -00dfca82a6dff817ec66f44342007202690a93763949 HEADmulti_ack thin-pack \ +00dfca82a6dff817ec66f44342007202690a93763949 HEAD□multi_ack thin-pack \ side-band side-band-64k ofs-delta shallow no-progress include-tag \ multi_ack_detailed symref=HEAD:refs/heads/master \ agent=git/2:2.1.1+github-607-gfba4028 @@ -261,7 +261,7 @@ The first is a `GET` to the same endpoint used in the dumb protocol: ---- => GET $GIT_URL/info/refs?service=git-upload-pack 001e# service=git-upload-pack -000000e7ca82a6dff817ec66f44342007202690a93763949 HEADmulti_ack thin-pack \ +00e7ca82a6dff817ec66f44342007202690a93763949 HEAD□multi_ack thin-pack \ side-band side-band-64k ofs-delta shallow no-progress include-tag \ multi_ack_detailed no-done symref=HEAD:refs/heads/master \ agent=git/2:2.1.1+github-607-gfba4028 From b83a3ed0225eb341ecba92b25a04e5eee3302621 Mon Sep 17 00:00:00 2001 From: zwPapEr Date: Sat, 4 Jul 2015 16:29:22 +0800 Subject: [PATCH 3/3] update the "done" problem, sample should be correct --- book/10-git-internals/sections/transfer-protocols.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/10-git-internals/sections/transfer-protocols.asc b/book/10-git-internals/sections/transfer-protocols.asc index d534f4e98..0a7d8ab43 100644 --- a/book/10-git-internals/sections/transfer-protocols.asc +++ b/book/10-git-internals/sections/transfer-protocols.asc @@ -248,8 +248,8 @@ At the end of this list, it writes ``done'' to initiate the `upload-pack` proces ---- 003cwant ca82a6dff817ec66f44342007202690a93763949 ofs-delta 0032have 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7 -0000 0009done +0000 ---- ====== HTTP(S)