Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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>
  • Loading branch information...
commit 2c6df2d5d1894d8951895334d80735868c6ac253 1 parent c150462
Rene Scharfe authored Junio C Hamano committed
Showing with 4 additions and 3 deletions.
  1. +4 −3 tar-tree.c
View
7 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();
Please sign in to comment.
Something went wrong with that request. Please try again.