undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make git-tar-tree use the tree_desc abstractions

Browse Source 
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds 2006-01-31 14:13:40 -08:00 committed by Junio C Hamano
parent 50f9a858ad
commit 7ec57556b2
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tar-tree.c
View File

@ -3,7 +3,7 @@
*/ */
#include <time.h> #include <time.h>
#include "cache.h" #include "cache.h"
#include "tree.h" #include "diff.h"
#include "commit.h" #include "commit.h"
#define RECORDSIZE (512) #define RECORDSIZE (512)
@ -336,37 +336,38 @@ static void write_header(const unsigned char *sha1, char typeflag, const char *b
write_if_needed(); write_if_needed();
} }
static void traverse_tree(struct tree *tree, static void traverse_tree(struct tree_desc *tree,
struct path_prefix *prefix) struct path_prefix *prefix)
{ {
struct path_prefix this_prefix; struct path_prefix this_prefix;
struct tree_entry_list *item;
this_prefix.prev = prefix; this_prefix.prev = prefix;
parse_tree(tree); while (tree->size) {
item = tree->entries; const char *name;
const unsigned char *sha1;
while (item) { unsigned mode;
void *eltbuf; void *eltbuf;
char elttype[20]; char elttype[20];
unsigned long eltsize; unsigned long eltsize;
eltbuf = read_sha1_file(item->item.any->sha1, sha1 = tree_entry_extract(tree, &name, &mode);
elttype, &eltsize); update_tree_entry(tree);
eltbuf = read_sha1_file(sha1, elttype, &eltsize);
if (!eltbuf) if (!eltbuf)
die("cannot read %s", die("cannot read %s", sha1_to_hex(sha1));
sha1_to_hex(item->item.any->sha1)); write_header(sha1, TYPEFLAG_AUTO, basedir,
write_header(item->item.any->sha1, TYPEFLAG_AUTO, basedir, prefix, name, mode, eltbuf, eltsize);
prefix, item->name, if (S_ISDIR(mode)) {
item->mode, eltbuf, eltsize); struct tree_desc subtree;
if (item->directory) { subtree.buf = eltbuf;
this_prefix.name = item->name; subtree.size = eltsize;
traverse_tree(item->item.tree, &this_prefix); this_prefix.name = name;
} else if (!item->symlink) { traverse_tree(&subtree, &this_prefix);
} else if (!S_ISLNK(mode)) {
write_blocked(eltbuf, eltsize); write_blocked(eltbuf, eltsize);
} }
free(eltbuf); free(eltbuf);
item = item->next;
} }
} }
@ -374,7 +375,7 @@ int main(int argc, char **argv)
{ {
unsigned char sha1[20]; unsigned char sha1[20];
struct commit *commit; struct commit *commit;
struct tree *tree; struct tree_desc tree;
setup_git_directory(); setup_git_directory();
@ -395,8 +396,8 @@ int main(int argc, char **argv)
write_global_extended_header(commit->object.sha1); write_global_extended_header(commit->object.sha1);
archive_time = commit->date; archive_time = commit->date;
} }
tree = parse_tree_indirect(sha1); tree.buf = read_object_with_reference(sha1, "tree", &tree.size, NULL);
if (!tree) if (!tree.buf)
die("not a reference to a tag, commit or tree object: %s", die("not a reference to a tag, commit or tree object: %s",
sha1_to_hex(sha1)); sha1_to_hex(sha1));
if (!archive_time) if (!archive_time)
@ -404,7 +405,7 @@ int main(int argc, char **argv)
if (basedir) if (basedir)
write_header((unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL, write_header((unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL,
basedir, 040777, NULL, 0); basedir, 040777, NULL, 0);
traverse_tree(tree, NULL); traverse_tree(&tree, NULL);
write_trailer(); write_trailer();
return 0; return 0;
} }