Merge branch 'ar/chmod-series' into next

diff --git a/tar-tree.c b/tar-tree.c
index 705b8fa1c76dc665333f180278dca929e2a971f7..fc60a90873d1928ce3ada6d26f0a0ae571d43773 100644 (file)
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -94,7 +94,6 @@ static void write_blocked(void *buf, unsigned long size)
        }
        if (size) {
                memcpy(block + offset, buf, size);
-               buf += size;
                offset += size;
        }
        tail = offset % RECORDSIZE;
@@ -336,7 +335,7 @@ int main(int argc, char **argv)
        } else
                archive_time = time(NULL);
 
-       tree.buf = read_object_with_reference(sha1, "tree", &tree.size,
+       tree.buf = read_object_with_reference(sha1, tree_type, &tree.size,
                                              tree_sha1);
        if (!tree.buf)
                die("not a reference to a tag, commit or tree object: %s",