adjust to the rebased series by Linus.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
May 29, 2006 at 22:00 UTC
e76abd701419b50937708cfec2f772d33057505e
1 file changed
+4
-7
builtin-read-tree.c
+4
-7
@@ -9,8 +9,8 @@
9
10
#include "object.h"
11
#include "tree.h"
12
-#include "cache-tree.h"
12
#include "tree-walk.h"
13
+#include "cache-tree.h"
14
#include <sys/time.h>
15
#include <signal.h>
16
#include "builtin.h"
@@ -777,12 +777,12 @@ static int read_cache_unmerged(void)
777
static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
778
{
779
struct tree_desc desc;
780
- int cnt = 0;
780
+ int cnt;
781
782
memcpy(it->sha1, tree->object.sha1, 20);
783
desc.buf = tree->buffer;
784
desc.size = tree->size;
785
-
785
+ cnt = 0;
786
while (desc.size) {
787
unsigned mode;
788
const char *name;
@@ -790,14 +790,11 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
790
791
sha1 = tree_entry_extract(&desc, &name, &mode);
792
update_tree_entry(&desc);
793
-
793
if (!S_ISDIR(mode))
794
cnt++;
795
else {
796
struct cache_tree_sub *sub;
798
- struct tree *subtree;
799
-
800
- subtree = lookup_tree(sha1);
797
+ struct tree *subtree = lookup_tree(sha1);
798
if (!subtree->object.parsed)
799
parse_tree(subtree);
800
sub = cache_tree_sub(it, name);