summaryrefslogtreecommitdiff
path: root/src/tree.c
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@elego.de>2011-05-05 16:22:06 +0200
committerCarlos Martín Nieto <cmn@elego.de>2011-05-05 16:22:06 +0200
commitca8d2dfc0cea0c16e2d6bae16d95d652e292f473 (patch)
treef98e0c362a388f9a9efe644ac3e38828f5f14807 /src/tree.c
parent094aaaaee92f4fc98a6c3c3af36183cb217948a8 (diff)
parentcc3b82e376e0216c1af4ad46d24327d61e9efd99 (diff)
downloadlibgit2-ca8d2dfc0cea0c16e2d6bae16d95d652e292f473.tar.gz
Merge remote-tracking branch 'upstream/development' into config
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;
}