Skip to content

Commit 123712b

Browse files
Martin Ågrengitster
authored andcommitted
index-format.txt: document SHA-256 index format
Document that in SHA-1 repositories, we use SHA-1 and in SHA-256 repositories, we use SHA-256, then replace all other uses of "SHA-1" with something more neutral. Avoid referring to "160-bit" hash values. Signed-off-by: Martin Ågren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5b6422a commit 123712b

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

Documentation/technical/index-format.txt

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ Git index format
33

44
== The Git index file has the following format
55

6-
All binary numbers are in network byte order. Version 2 is described
7-
here unless stated otherwise.
6+
All binary numbers are in network byte order.
7+
In a repository using the traditional SHA-1, checksums and object IDs
8+
(object names) mentioned below are all computed using SHA-1. Similarly,
9+
in SHA-256 repositories, these values are computed using SHA-256.
10+
Version 2 is described here unless stated otherwise.
811

912
- A 12-byte header consisting of
1013

@@ -32,8 +35,7 @@ Git index format
3235

3336
Extension data
3437

35-
- 160-bit SHA-1 over the content of the index file before this
36-
checksum.
38+
- Hash checksum over the content of the index file before this checksum.
3739

3840
== Index entry
3941

@@ -80,7 +82,7 @@ Git index format
8082
32-bit file size
8183
This is the on-disk size from stat(2), truncated to 32-bit.
8284

83-
160-bit SHA-1 for the represented object
85+
Object name for the represented object
8486

8587
A 16-bit 'flags' field split into (high to low bits)
8688

@@ -160,8 +162,8 @@ Git index format
160162

161163
- A newline (ASCII 10); and
162164

163-
- 160-bit object name for the object that would result from writing
164-
this span of index as a tree.
165+
- Object name for the object that would result from writing this span
166+
of index as a tree.
165167

166168
An entry can be in an invalidated state and is represented by having
167169
a negative number in the entry_count field. In this case, there is no
@@ -198,7 +200,7 @@ Git index format
198200
stage 1 to 3 (a missing stage is represented by "0" in this field);
199201
and
200202

201-
- At most three 160-bit object names of the entry in stages from 1 to 3
203+
- At most three object names of the entry in stages from 1 to 3
202204
(nothing is written for a missing stage).
203205

204206
=== Split index
@@ -211,8 +213,8 @@ Git index format
211213

212214
The extension consists of:
213215

214-
- 160-bit SHA-1 of the shared index file. The shared index file path
215-
is $GIT_DIR/sharedindex.<SHA-1>. If all 160 bits are zero, the
216+
- Hash of the shared index file. The shared index file path
217+
is $GIT_DIR/sharedindex.<hash>. If all bits are zero, the
216218
index does not require a shared index file.
217219

218220
- An ewah-encoded delete bitmap, each bit represents an entry in the
@@ -253,10 +255,10 @@ Git index format
253255

254256
- 32-bit dir_flags (see struct dir_struct)
255257

256-
- 160-bit SHA-1 of $GIT_DIR/info/exclude. Null SHA-1 means the file
258+
- Hash of $GIT_DIR/info/exclude. A null hash means the file
257259
does not exist.
258260

259-
- 160-bit SHA-1 of core.excludesfile. Null SHA-1 means the file does
261+
- Hash of core.excludesfile. A null hash means the file does
260262
not exist.
261263

262264
- NUL-terminated string of per-dir exclude file name. This usually
@@ -285,13 +287,13 @@ The remaining data of each directory block is grouped by type:
285287
- An ewah bitmap, the n-th bit records "check-only" bit of
286288
read_directory_recursive() for the n-th directory.
287289

288-
- An ewah bitmap, the n-th bit indicates whether SHA-1 and stat data
290+
- An ewah bitmap, the n-th bit indicates whether hash and stat data
289291
is valid for the n-th directory and exists in the next data.
290292

291293
- An array of stat data. The n-th data corresponds with the n-th
292294
"one" bit in the previous ewah bitmap.
293295

294-
- An array of SHA-1. The n-th SHA-1 corresponds with the n-th "one" bit
296+
- An array of hashes. The n-th hash corresponds with the n-th "one" bit
295297
in the previous ewah bitmap.
296298

297299
- One NUL.
@@ -330,12 +332,12 @@ The remaining data of each directory block is grouped by type:
330332

331333
- 32-bit offset to the end of the index entries
332334

333-
- 160-bit SHA-1 over the extension types and their sizes (but not
335+
- Hash over the extension types and their sizes (but not
334336
their contents). E.g. if we have "TREE" extension that is N-bytes
335337
long, "REUC" extension that is M-bytes long, followed by "EOIE",
336338
then the hash would be:
337339

338-
SHA-1("TREE" + <binary representation of N> +
340+
Hash("TREE" + <binary representation of N> +
339341
"REUC" + <binary representation of M>)
340342

341343
== Index Entry Offset Table

0 commit comments

Comments
 (0)