summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-24 17:20:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-24 17:20:02 (GMT)
commit11bd95604ab6ebc8c2edf7db4dccb33c7659890b (patch)
tree1b5fc5153d000bbe96274db537891d4ad7c94d40 /Documentation/technical
parentbdfc15fb21328a1461191863777583d32c034077 (diff)
parent5c377d3d593d324346bbaa965cbff8870795b420 (diff)
downloadgit-11bd95604ab6ebc8c2edf7db4dccb33c7659890b.zip
git-11bd95604ab6ebc8c2edf7db4dccb33c7659890b.tar.gz
git-11bd95604ab6ebc8c2edf7db4dccb33c7659890b.tar.bz2
Merge branch 'rs/object-id'
Conversion from uchar[20] to struct object_id continues. * rs/object-id: tree-walk: convert fill_tree_descriptor() to object_id
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/api-tree-walking.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/technical/api-tree-walking.txt b/Documentation/technical/api-tree-walking.txt
index 14af37c..bde1862 100644
--- a/Documentation/technical/api-tree-walking.txt
+++ b/Documentation/technical/api-tree-walking.txt
@@ -55,9 +55,9 @@ Initializing
`fill_tree_descriptor`::
- Initialize a `tree_desc` and decode its first entry given the sha1 of
- a tree. Returns the `buffer` member if the sha1 is a valid tree
- identifier and NULL otherwise.
+ Initialize a `tree_desc` and decode its first entry given the
+ object ID of a tree. Returns the `buffer` member if the latter
+ is a valid tree identifier and NULL otherwise.
`setup_traverse_info`::