aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-07-31 18:57:32 -0700
committerJunio C Hamano <gitster@pobox.com>2011-07-31 18:57:32 -0700
commitb35acb53458d0f99ba2400b902980b35e5acc2d3 (patch)
tree2e599a9af18af3b62ce52318b2759faa7d92f311 /Documentation
parent4db0d0d1ba94c08f9476c7adff61375a752b154d (diff)
parentd5b66299040969706dd675c021f4336a26a6cc82 (diff)
downloadgit-b35acb53458d0f99ba2400b902980b35e5acc2d3.tar.gz
git-b35acb53458d0f99ba2400b902980b35e5acc2d3.tar.xz
Merge branch 'maint'
* maint: Break down no-lstat() condition checks in verify_uptodate() t7400: fix bogus test failure with symlinked trash Documentation: clarify the invalidated tree entry format
Diffstat (limited to 'Documentation')
-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 7b233ca19..8930b3fab 100644
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -147,8 +147,9 @@ GIT index format
- 160-bit object name for the object that would result from writing
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.
+ 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.
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