summaryrefslogtreecommitdiff
path: root/tree-walk.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-26 23:42:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-26 23:42:59 (GMT)
commit515cc0101943b766fde7aa894827119e332ec033 (patch)
tree29fb328e0ef904cf78c2c06a0fbc49e0e484dbae /tree-walk.h
parentb5442ca101c2d2b6eacaf3428505e5006f2218ae (diff)
parentea16a030aaaaebb3d0038e3ec2d9cd837985dee0 (diff)
downloadgit-515cc0101943b766fde7aa894827119e332ec033.zip
git-515cc0101943b766fde7aa894827119e332ec033.tar.gz
git-515cc0101943b766fde7aa894827119e332ec033.tar.bz2
Merge branch 'maint'
* maint: for-each-ref: fix objectname:short bug tree-walk: Correct bitrotted comment about tree_entry() Fix 'git log' early pager startup error case
Diffstat (limited to 'tree-walk.h')
-rw-r--r--tree-walk.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/tree-walk.h b/tree-walk.h
index 88ea7e9..7e3e0b5 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -28,7 +28,10 @@ static inline int tree_entry_len(const char *name, const unsigned char *sha1)
void update_tree_entry(struct tree_desc *);
void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
-/* Helper function that does both of the above and returns true for success */
+/*
+ * Helper function that does both tree_entry_extract() and update_tree_entry()
+ * and returns true for success
+ */
int tree_entry(struct tree_desc *, struct name_entry *);
void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);