Junio C Hamano <gitster@xxxxxxxxx> writes:
> "Thomas Ackermann via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
>
>> From: Thomas Ackermann <th.acker@xxxxxxxx>
>>
>> Use SHA-1 and SHA-256 instead of sha1 and sha256 when referring
>> to the hash type.
>
> Ahh. [1/6] was supposed to be only about formatting, and I found it
> a bit irritating that it had some of these changes mixed in, as it
> was not entirely clear to me that [1/6] covered all those lowercase
> sha1 and sha256 instances, or just some of them.
>
> Moving them from [1/6] to this step would help future readers by
> reducing such irritation (I do not know if it is worth it until
> I read through the series to the end).
It seems that only one hunk in 1/6 had premature conversion.
I've tried to locally move it around before queuing.
Thanks.
1: eea107fb0e ! 1: 5df3cc249d doc hash-function-transition: fix asciidoc output
@@ Documentation/technical/hash-function-transition.txt: network byte order):
Loose object index
~~~~~~~~~~~~~~~~~~
@@ Documentation/technical/hash-function-transition.txt: the following steps:
- they will be discarded.)
3. convert to sha256: open a new (sha256) packfile. Read the topologically
sorted list just generated. For each object, inflate its
-- sha1-content, convert to sha256-content, and write it to the sha256
+ sha1-content, convert to sha256-content, and write it to the sha256
- pack. Record the new sha1<->sha256 mapping entry for use in the idx.
-+ SHA-1 content, convert to SHA-256 content, and write it to the SHA-256
-+ pack. Record the new SHA-1<-->SHA-256 mapping entry for use in the idx.
++ pack. Record the new sha1<-->sha256 mapping entry for use in the idx.
4. sort: reorder entries in the new pack to match the order of objects
in the pack the server generated and include blobs. Write a sha256 idx
file
2: 58934c8b43 ! 2: 8488d4f5f1 doc hash-function-transition: use SHA-1 and SHA-256 consistently
@@ Documentation/technical/hash-function-transition.txt: the following steps:
-3. convert to sha256: open a new (sha256) packfile. Read the topologically
+3. convert to SHA-256: open a new SHA-256 packfile. Read the topologically
sorted list just generated. For each object, inflate its
- SHA-1 content, convert to SHA-256 content, and write it to the SHA-256
- pack. Record the new SHA-1<-->SHA-256 mapping entry for use in the idx.
+- sha1-content, convert to sha256-content, and write it to the sha256
+- pack. Record the new sha1<-->sha256 mapping entry for use in the idx.
++ SHA-1 content, convert to SHA-256 content, and write it to the SHA-256
++ pack. Record the new SHA-1<-->SHA-256 mapping entry for use in the idx.
4. sort: reorder entries in the new pack to match the order of objects
- in the pack the server generated and include blobs. Write a sha256 idx
+ in the pack the server generated and include blobs. Write a SHA-256 idx
3: 4a710c8715 = 3: 454a9437cf doc hash-function-transition: use upper case consistently
4: 7e690524ac = 4: b2c881b66b doc hash-function-transition: fix incomplete sentence
5: 80089fe818 = 5: 4ee4775ca3 doc hash-function-transition: move rationale upwards
6: b221eae801 = 6: c27c52ca0c doc: use https links
