diff options
| author | Rene Scharfe <rene.scharfe@lsrfire.ath.cx> | 2006-03-25 23:21:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-25 16:34:37 -0800 |
| commit | 2c6df2d5d1894d8951895334d80735868c6ac253 (patch) | |
| tree | cd54ad2c1e3c624cffabf6a2c544fbe5f1817e1e /tar-tree.c | |
| parent | c150462824008957f568ca7aa05a65b35d860eb9 (diff) | |
| download | git-2c6df2d5d1894d8951895334d80735868c6ac253.tar.gz | |
tar-tree: Use SHA1 of root tree for the basedir
... instead of the made-up "0".
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'tar-tree.c')
| -rw-r--r-- | tar-tree.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tar-tree.c b/tar-tree.c index e478e13e28..32f226ea5c 100644 --- a/tar-tree.c +++ b/tar-tree.c @@ -375,7 +375,7 @@ static void traverse_tree(struct tree_desc *tree, int main(int argc, char **argv) { - unsigned char sha1[20]; + unsigned char sha1[20], tree_sha1[20]; struct commit *commit; struct tree_desc tree; @@ -398,14 +398,15 @@ int main(int argc, char **argv) write_global_extended_header(commit->object.sha1); archive_time = commit->date; } - tree.buf = read_object_with_reference(sha1, "tree", &tree.size, NULL); + tree.buf = read_object_with_reference(sha1, "tree", &tree.size, + tree_sha1); if (!tree.buf) die("not a reference to a tag, commit or tree object: %s", sha1_to_hex(sha1)); if (!archive_time) archive_time = time(NULL); if (basedir) - write_header((unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL, + write_header(tree_sha1, TYPEFLAG_DIR, NULL, NULL, basedir, 040777, NULL, 0); traverse_tree(&tree, NULL); write_trailer(); |