Skip to content

Commit 23b7aa2

Browse files
committed
Merge pull request #323 from zwpaper/example_fix
fixed number error in transfer-protocols example
2 parents a1792ab + b83a3ed commit 23b7aa2

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

book/10-git-internals/sections/transfer-protocols.asc

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,9 @@ It tries to run a command on the remote server via an SSH call that looks someth
144144
[source,console]
145145
----
146146
$ ssh -x git@server "git-receive-pack 'simplegit-progit.git'"
147-
005bca82a6dff817ec66f4437202690a93763949 refs/heads/master report-status \
147+
00a5ca82a6dff817ec66f4437202690a93763949 refs/heads/masterreport-status \
148148
delete-refs side-band-64k quiet ofs-delta \
149149
agent=git/2:2.1.1+github-607-gfba4028 delete-refs
150-
003e085bb3bcb608e1e84b2432f8ecbe6306e7e7 refs/heads/topic
151150
0000
152151
----
153152

@@ -165,9 +164,9 @@ For instance, if you're updating the `master` branch and adding an `experiment`
165164

166165
[source]
167166
----
168-
0085ca82a6dff817ec66f44342007202690a93763949 15027957951b64cf874c3557a0f3547bd83b3ff6 \
167+
0076ca82a6dff817ec66f44342007202690a93763949 15027957951b64cf874c3557a0f3547bd83b3ff6 \
169168
refs/heads/master report-status
170-
00670000000000000000000000000000000000000000 cdfdb42577e2506715f8cfeacdbabc092bf63e8d \
169+
006c0000000000000000000000000000000000000000 cdfdb42577e2506715f8cfeacdbabc092bf63e8d \
171170
refs/heads/experiment
172171
0000
173172
----
@@ -182,7 +181,7 @@ Finally, the server responds with a success (or failure) indication:
182181

183182
[source]
184183
----
185-
000Aunpack ok
184+
000eunpack ok
186185
----
187186

188187
====== HTTP(S)
@@ -194,8 +193,8 @@ The connection is initiated with this request:
194193
----
195194
=> GET http://server/simplegit-progit.git/info/refs?service=git-receive-pack
196195
001f# service=git-receive-pack
197-
000000ab6c5f0e45abd7832bf23074a333f739977c9e8188 refs/heads/master \
198-
report-status delete-refs side-band-64k quiet ofs-delta \
196+
00ab6c5f0e45abd7832bf23074a333f739977c9e8188 refs/heads/master□report-status \
197+
delete-refs side-band-64k quiet ofs-delta \
199198
agent=git/2:2.1.1~vmg-bitmaps-bugaloo-608-g116744e
200199
0000
201200
----
@@ -230,11 +229,11 @@ After `fetch-pack` connects, `upload-pack` sends back something like this:
230229

231230
[source]
232231
----
233-
00dfca82a6dff817ec66f44342007202690a93763949 HEADmulti_ack thin-pack \
232+
00dfca82a6dff817ec66f44342007202690a93763949 HEAD□multi_ack thin-pack \
234233
side-band side-band-64k ofs-delta shallow no-progress include-tag \
235234
multi_ack_detailed symref=HEAD:refs/heads/master \
236235
agent=git/2:2.1.1+github-607-gfba4028
237-
003fca82a6dff817ec66f44342007202690a93763949 refs/heads/master
236+
003fe2409a098dc3e53539a9028a94b6224db9d6a6b6 refs/heads/master
238237
0000
239238
----
240239

@@ -247,10 +246,10 @@ At the end of this list, it writes ``done'' to initiate the `upload-pack` proces
247246

248247
[source]
249248
----
250-
0054want ca82a6dff817ec66f44342007202690a93763949 ofs-delta
249+
003cwant ca82a6dff817ec66f44342007202690a93763949 ofs-delta
251250
0032have 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
252-
0000
253251
0009done
252+
0000
254253
----
255254

256255
====== HTTP(S)
@@ -262,7 +261,7 @@ The first is a `GET` to the same endpoint used in the dumb protocol:
262261
----
263262
=> GET $GIT_URL/info/refs?service=git-upload-pack
264263
001e# service=git-upload-pack
265-
000000e7ca82a6dff817ec66f44342007202690a93763949 HEADmulti_ack thin-pack \
264+
00e7ca82a6dff817ec66f44342007202690a93763949 HEAD□multi_ack thin-pack \
266265
side-band side-band-64k ofs-delta shallow no-progress include-tag \
267266
multi_ack_detailed no-done symref=HEAD:refs/heads/master \
268267
agent=git/2:2.1.1+github-607-gfba4028

0 commit comments

Comments
 (0)