summaryrefslogtreecommitdiff
path: root/src/tree.c
diff options
context:
space:
mode:
authorVicent Martí <tanoku@gmail.com>2011-05-02 15:26:16 -0700
committerVicent Martí <tanoku@gmail.com>2011-05-02 15:26:16 -0700
commitfde97669ec7f07b339233601f39100ecfc089c53 (patch)
tree20279764a945fb97bf980381c9fdea75b5479da2 /src/tree.c
parent1648fbd34457c287ffb961457349689c67f3ad97 (diff)
parent555ce568196f62558eb5a9084ba61add7e6b1ba1 (diff)
downloadlibgit2-fde97669ec7f07b339233601f39100ecfc089c53.tar.gz
Merge pull request #146 from nordsturm/fix_subtrees.
Fix tree-entry attribute convertion (fix corrupted trees)
Diffstat (limited to 'src/tree.c')
-rw-r--r--src/tree.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tree.c b/src/tree.c
index 64f81d780..b7daf39c4 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -424,7 +424,8 @@ int git_treebuilder_write(git_oid *oid, git_repository *repo, git_treebuilder *b
if (entry->removed)
continue;
- size += (entry->attr > 0x7FF) ? 7 : 6;
+ snprintf(filemode, sizeof(filemode), "%o ", entry->attr);
+ size += strlen(filemode);
size += entry->filename_len + 1;
size += GIT_OID_RAWSZ;
}