From: Junio C Hamano <junkio@cox.net>
Date: Fri, 2 Jun 2006 22:24:07 +0000 (-0700)
Subject: Merge branch 'lt/tree-2' into next
X-Git-Tag: v1.4.1-rc1~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0fa5cb0d1e13bf757b41b0b0665305b7c819ee60?ds=inline;hp=-c

Merge branch 'lt/tree-2' into next

* lt/tree-2:
fetch.c: do not call process_tree() from process_tree().
---

0fa5cb0d1e13bf757b41b0b0665305b7c819ee60
diff --combined fetch.c
index 1291bbac94,107504b72b..e040ef97b6
--- a/fetch.c
+++ b/fetch.c
@@@ -9,7 -9,6 +9,7 @@@
  #include "refs.h"
  
  const char *write_ref = NULL;
 +const char *write_ref_log_details = NULL;
  
  int get_tree = 0;
  int get_history = 0;
@@@ -47,13 -46,20 +47,20 @@@ static int process_tree(struct tree *tr
  	desc.buf = tree->buffer;
  	desc.size = tree->size;
  	while (tree_entry(&desc, &entry)) {
+ 		struct object *obj = NULL;
+ 
  		if (S_ISDIR(entry.mode)) {
  			struct tree *tree = lookup_tree(entry.sha1);
- 			process_tree(tree);
- 		} else {
+ 			if (tree)
+ 				obj = &tree->object;
+ 		}
+ 		else {
  			struct blob *blob = lookup_blob(entry.sha1);
- 			process(&blob->object);
+ 			if (blob)
+ 				obj = &blob->object;
  		}
+ 		if (!obj || process(obj))
+ 			return -1;
  	}
  	free(tree->buffer);
  	tree->buffer = NULL;
@@@ -209,51 -215,23 +216,51 @@@ static int mark_complete(const char *pa
  
  int pull(char *target)
  {
 +	struct ref_lock *lock = NULL;
  	unsigned char sha1[20];
 +	char *msg;
 +	int ret;
  
  	save_commit_buffer = 0;
  	track_object_refs = 0;
 +	if (write_ref) {
 +		lock = lock_ref_sha1(write_ref, NULL, 0);
 +		if (!lock) {
 +			error("Can't lock ref %s", write_ref);
 +			return -1;
 +		}
 +	}
  
  	if (!get_recover)
  		for_each_ref(mark_complete);
  
 -	if (interpret_target(target, sha1))
 -		return error("Could not interpret %s as something to pull",
 -			     target);
 -	if (process(lookup_unknown_object(sha1)))
 +	if (interpret_target(target, sha1)) {
 +		error("Could not interpret %s as something to pull", target);
 +		if (lock)
 +			unlock_ref(lock);
  		return -1;
 -	if (loop())
 +	}
 +	if (process(lookup_unknown_object(sha1))) {
 +		if (lock)
 +			unlock_ref(lock);
  		return -1;
 -	
 -	if (write_ref)
 -		write_ref_sha1_unlocked(write_ref, sha1);
 +	}
 +	if (loop()) {
 +		if (lock)
 +			unlock_ref(lock);
 +		return -1;
 +	}
 +
 +	if (write_ref) {
 +		if (write_ref_log_details) {
 +			msg = xmalloc(strlen(write_ref_log_details) + 12);
 +			sprintf(msg, "fetch from %s", write_ref_log_details);
 +		} else
 +			msg = NULL;
 +		ret = write_ref_sha1(lock, sha1, msg ? msg : "fetch (unknown)");
 +		if (msg)
 +			free(msg);
 +		return ret;
 +	}
  	return 0;
  }