diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-03 23:59:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-03 23:59:27 -0700 |
| commit | 16a4c6ee0d9a3d07d4d0afbbc4e3467e78065eca (patch) | |
| tree | e76b6ce43feac1834a88737554392cbf3eba04ee /blame.c | |
| parent | Merge branch 'sp/reflog' (diff) | |
| parent | fetch.c: do not call process_tree() from process_tree(). (diff) | |
| download | tgif-16a4c6ee0d9a3d07d4d0afbbc4e3467e78065eca.tar.xz | |
Merge branch 'lt/tree-2'
* lt/tree-2:
fetch.c: do not call process_tree() from process_tree().
tree_entry(): new tree-walking helper function
adjust to the rebased series by Linus.
Remove "tree->entries" tree-entry list from tree parser
Switch "read_tree_recursive()" over to tree-walk functionality
Make "tree_entry" have a SHA1 instead of a union of object pointers
Add raw tree buffer info to "struct tree"
Remove last vestiges of generic tree_entry_list
Convert fetch.c: process_tree() to raw tree walker
Convert "mark_tree_uninteresting()" to raw tree walker
Remove unused "zeropad" entry from tree_list_entry
fsck-objects: avoid unnecessary tree_entry_list usage
Remove "tree->entries" tree-entry list from tree parser
builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec()
Switch "read_tree_recursive()" over to tree-walk functionality
Make "tree_entry" have a SHA1 instead of a union of object pointers
Make "struct tree" contain the pointer to the tree buffer
Diffstat (limited to 'blame.c')
| -rw-r--r-- | blame.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -149,7 +149,7 @@ static void free_patch(struct patch *p) free(p); } -static int get_blob_sha1_internal(unsigned char *sha1, const char *base, +static int get_blob_sha1_internal(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage); @@ -178,7 +178,7 @@ static int get_blob_sha1(struct tree *t, const char *pathname, return 0; } -static int get_blob_sha1_internal(unsigned char *sha1, const char *base, +static int get_blob_sha1_internal(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage) { |