kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

adjust to the rebased series by Linus. 

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-05-29 22:00:21 -07:00
parent 0a2586c807
commit e76abd7014
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin-read-tree.c
View File

@ -9,8 +9,8 @@


#include "object.h" #include "object.h"
#include "tree.h" #include "tree.h"
#include "cache-tree.h"
#include "tree-walk.h" #include "tree-walk.h"
#include "cache-tree.h"
#include <sys/time.h> #include <sys/time.h>
#include <signal.h> #include <signal.h>
#include "builtin.h" #include "builtin.h"
@ -777,12 +777,12 @@ static int read_cache_unmerged(void)
static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree) static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
{ {
struct tree_desc desc; struct tree_desc desc;
int cnt = 0; int cnt;


memcpy(it->sha1, tree->object.sha1, 20); memcpy(it->sha1, tree->object.sha1, 20);
desc.buf = tree->buffer; desc.buf = tree->buffer;
desc.size = tree->size; desc.size = tree->size;

cnt = 0;
while (desc.size) { while (desc.size) {
unsigned mode; unsigned mode;
const char *name; const char *name;
@ -790,14 +790,11 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)


sha1 = tree_entry_extract(&desc, &name, &mode); sha1 = tree_entry_extract(&desc, &name, &mode);
update_tree_entry(&desc); update_tree_entry(&desc);

if (!S_ISDIR(mode)) if (!S_ISDIR(mode))
cnt++; cnt++;
else { else {
struct cache_tree_sub *sub; struct cache_tree_sub *sub;
struct tree *subtree; struct tree *subtree = lookup_tree(sha1);

subtree = lookup_tree(sha1);
if (!subtree->object.parsed) if (!subtree->object.parsed)
parse_tree(subtree); parse_tree(subtree);
sub = cache_tree_sub(it, name); sub = cache_tree_sub(it, name);