mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-09 12:36:08 +02:00
Code

[PATCH] Teach read-tree about commit objects 

Updates read-tree to use read_tree_with_tree_or_commit_sha1()
function.  The command can take either tree or commit IDs with
this patch.

The change involves a slight modification of how it recurses down
the tree.  Earlier the caller only supplied SHA1 and the recurser
read the object using it, but now it is the caller's responsibility
to read the object and give it to the recurser.  This matches the
way recursive behaviour is done in other tree- related commands.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano 2005-04-20 18:06:50 -07:00 committed by Linus Torvalds
parent 23b127ed08
commit b12ec373b8
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
read-tree.c
View File

@ -23,16 +23,11 @@ static int read_one_entry(unsigned char *sha1, const char *base, int baselen, co
return add_cache_entry(ce, 1);
}
static int read_tree(unsigned char *sha1, const char *base, int baselen)
static int read_tree_recursive(void *buffer, const char *type,
unsigned long size,
const char *base, int baselen)
{
void *buffer;
unsigned long size;
char type[20];
buffer = read_sha1_file(sha1, type, &size);
if (!buffer)
return -1;
if (strcmp(type, "tree"))
if (!buffer || strcmp(type, "tree"))
return -1;
while (size) {
int len = strlen(buffer)+1;
@ -50,10 +45,20 @@ static int read_tree(unsigned char *sha1, const char *base, int baselen)
int retval;
int pathlen = strlen(path);
char *newbase = malloc(baselen + 1 + pathlen);
void *eltbuf;
char elttype[20];
unsigned long eltsize;
eltbuf = read_sha1_file(sha1, elttype, &eltsize);
if (!eltbuf)
return -1;
memcpy(newbase, base, baselen);
memcpy(newbase + baselen, path, pathlen);
newbase[baselen + pathlen] = '/';
retval = read_tree(sha1, newbase, baselen + pathlen + 1);
retval = read_tree_recursive(eltbuf, elttype, eltsize,
newbase,
baselen + pathlen + 1);
free(eltbuf);
free(newbase);
if (retval)
return -1;
@ -65,6 +70,15 @@ static int read_tree(unsigned char *sha1, const char *base, int baselen)
return 0;
}
static int read_tree(unsigned char *sha1, const char *base, int baselen)
{
void *buffer;
unsigned long size;
buffer = read_tree_with_tree_or_commit_sha1(sha1, &size, 0);
return read_tree_recursive(buffer, "tree", size, base, baselen);
}
static int remove_lock = 0;
static void remove_lock_file(void)