* [PATCH 3/8] Doc: Improve shallow depth wording
@ 2012-09-16 10:57 Philip Oakley
2012-09-17 5:46 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Philip Oakley @ 2012-09-16 10:57 UTC (permalink / raw)
To: gitList
Avoid confusion in compound sentence about the start of the commit set
and the depth measure. Use two sentences.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index 49cdc57..fa4acab 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -258,9 +258,11 @@ a positive depth, this step is skipped.
unshallow-line = PKT-LINE("unshallow" SP obj-id)
----
-If the client has requested a positive depth, the server will compute
-the set of commits which are no deeper than the desired depth, starting
-at the client's wants. The server writes 'shallow' lines for each
+If the client has requested a positive depth the server will compute
+the set of commits which are no deeper than the desired depth. The set
+of commits start at the client's wants.
+
+The server writes 'shallow' lines for each
commit whose parents will not be sent as a result. The server writes
an 'unshallow' line for each commit which the client has indicated is
shallow, but is no longer shallow at the currently requested depth
--
1.7.8.msysgit.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3/8] Doc: Improve shallow depth wording
2012-09-16 10:57 [PATCH 3/8] Doc: Improve shallow depth wording Philip Oakley
@ 2012-09-17 5:46 ` Junio C Hamano
2012-09-17 21:56 ` Philip Oakley
2012-09-18 20:36 ` Junio C Hamano
0 siblings, 2 replies; 6+ messages in thread
From: Junio C Hamano @ 2012-09-17 5:46 UTC (permalink / raw)
To: Philip Oakley; +Cc: gitList
Philip Oakley <philipoakley@iee.org> writes:
> Avoid confusion in compound sentence about the start of the commit set
> and the depth measure. Use two sentences.
Dropping the first ',' after "positive depth" does not seem to make
it any easier to read (I personally think it makes it a lot harder
to read). Splitting the tail-end of the sentence into a separate
sentence does make it easier to read, though.
>
> Signed-off-by: Philip Oakley <philipoakley@iee.org>
>
> diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
> index 49cdc57..fa4acab 100644
> --- a/Documentation/technical/pack-protocol.txt
> +++ b/Documentation/technical/pack-protocol.txt
> @@ -258,9 +258,11 @@ a positive depth, this step is skipped.
> unshallow-line = PKT-LINE("unshallow" SP obj-id)
> ----
>
> -If the client has requested a positive depth, the server will compute
> -the set of commits which are no deeper than the desired depth, starting
> -at the client's wants. The server writes 'shallow' lines for each
> +If the client has requested a positive depth the server will compute
> +the set of commits which are no deeper than the desired depth. The set
> +of commits start at the client's wants.
> +
> +The server writes 'shallow' lines for each
> commit whose parents will not be sent as a result. The server writes
> an 'unshallow' line for each commit which the client has indicated is
> shallow, but is no longer shallow at the currently requested depth
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 3/8] Doc: Improve shallow depth wording
2012-09-17 5:46 ` Junio C Hamano
@ 2012-09-17 21:56 ` Philip Oakley
2012-09-18 20:36 ` Junio C Hamano
1 sibling, 0 replies; 6+ messages in thread
From: Philip Oakley @ 2012-09-17 21:56 UTC (permalink / raw)
To: Junio C Hamano; +Cc: gitList
From: "Junio C Hamano" <gitster@pobox.com>
> Philip Oakley <philipoakley@iee.org> writes:
>
>> Avoid confusion in compound sentence about the start of the commit
>> set
>> and the depth measure. Use two sentences.
>
> Dropping the first ',' after "positive depth" does not seem to make
> it any easier to read (I personally think it makes it a lot harder
> to read).
Accepted. My mistake - will correct.
> Splitting the tail-end of the sentence into a separate
> sentence does make it easier to read, though.
>
Philip
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/8] Doc: Improve shallow depth wording
2012-09-17 5:46 ` Junio C Hamano
2012-09-17 21:56 ` Philip Oakley
@ 2012-09-18 20:36 ` Junio C Hamano
2012-09-18 21:30 ` Philip Oakley
1 sibling, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2012-09-18 20:36 UTC (permalink / raw)
To: Philip Oakley; +Cc: gitList
Junio C Hamano <gitster@pobox.com> writes:
> Philip Oakley <philipoakley@iee.org> writes:
>
>> Avoid confusion in compound sentence about the start of the commit set
>> and the depth measure. Use two sentences.
>
> Dropping the first ',' after "positive depth" does not seem to make
> it any easier to read (I personally think it makes it a lot harder
> to read). Splitting the tail-end of the sentence into a separate
> sentence does make it easier to read, though.
Will add ',' locally and queue; no need to resend.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/8] Doc: Improve shallow depth wording
2012-09-18 20:36 ` Junio C Hamano
@ 2012-09-18 21:30 ` Philip Oakley
2012-09-18 21:54 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Philip Oakley @ 2012-09-18 21:30 UTC (permalink / raw)
To: Junio C Hamano; +Cc: gitList
From: "Junio C Hamano" <gitster@pobox.com>
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Philip Oakley <philipoakley@iee.org> writes:
>>
>>> Avoid confusion in compound sentence about the start of the commit
>>> set
>>> and the depth measure. Use two sentences.
>>
>> Dropping the first ',' after "positive depth" does not seem to make
>> it any easier to read (I personally think it makes it a lot harder
>> to read). Splitting the tail-end of the sentence into a separate
>> sentence does make it easier to read, though.
>
> Will add ',' locally and queue; no need to resend.
>
> Thanks.
And the simple corrections to patches 5/6/7 ? Shall I send?
Philip
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/8] Doc: Improve shallow depth wording
2012-09-18 21:30 ` Philip Oakley
@ 2012-09-18 21:54 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2012-09-18 21:54 UTC (permalink / raw)
To: Philip Oakley; +Cc: gitList
"Philip Oakley" <philipoakley@iee.org> writes:
> And the simple corrections to patches 5/6/7 ? Shall I send?
Juggling topics from many people, it is hard to keep track of how
many out of how many patches in the original series are still
relevant, so I would appreciate [PATCH vn N/M] with revamped values
for n, N and M as appropriate ;-)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-18 21:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-16 10:57 [PATCH 3/8] Doc: Improve shallow depth wording Philip Oakley
2012-09-17 5:46 ` Junio C Hamano
2012-09-17 21:56 ` Philip Oakley
2012-09-18 20:36 ` Junio C Hamano
2012-09-18 21:30 ` Philip Oakley
2012-09-18 21:54 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).