summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-12-22 20:37:09 -0800
committerJunio C Hamano <gitster@pobox.com>2012-12-22 20:37:09 -0800
commitdf54d595662411ad8eeaa09e80c781c82943b452 (patch)
treebd172bfeb705ddcb4dc5e522bb66819de1ca4863
parentccc3ae799c61ac9ea812396de2e28bd3c9ac2060 (diff)
parent4a6385fe555f810e8168399df673d00addffb721 (diff)
downloadgit-df54d595662411ad8eeaa09e80c781c82943b452.tar.gz
Merge branch 'nd/index-format-doc' into maint
* nd/index-format-doc: index-format.txt: clarify what is "invalid"
-rw-r--r--Documentation/technical/index-format.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index 57d6f915b1..7324154838 100644
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -161,8 +161,9 @@ GIT index format
this span of index as a tree.
An entry can be in an invalidated state and is represented by having
- -1 in the entry_count field. In this case, there is no object name
- and the next entry starts immediately after the newline.
+ a negative number in the entry_count field. In this case, there is no
+ object name and the next entry starts immediately after the newline.
+ When writing an invalid entry, -1 should always be used as entry_count.
The entries are written out in the top-down, depth-first order. The
first entry represents the root level of the repository, followed by the