projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove "tree->entries" tree-entry list from tree parser
[git.git]
/
fetch.c
diff --git
a/fetch.c
b/fetch.c
index
390de99
..
d9fe41f
100644
(file)
--- a/
fetch.c
+++ b/
fetch.c
@@
-9,12
+9,11
@@
const char *write_ref = NULL;
const char *write_ref = NULL;
-const unsigned char *current_ref = NULL;
-
int get_tree = 0;
int get_history = 0;
int get_all = 0;
int get_verbosely = 0;
int get_tree = 0;
int get_history = 0;
int get_all = 0;
int get_verbosely = 0;
+int get_recover = 0;
static unsigned char current_commit_sha1[20];
void pull_say(const char *fmt, const char *hex)
static unsigned char current_commit_sha1[20];
void pull_say(const char *fmt, const char *hex)
@@
-42,21
+41,28
@@
static int process_tree(struct tree *tree)
if (parse_tree(tree))
return -1;
if (parse_tree(tree))
return -1;
- entry = tree->entries;
- tree->entries = NULL;
+ entry = create_tree_entry_list(tree);
while (entry) {
struct tree_entry_list *next = entry->next;
while (entry) {
struct tree_entry_list *next = entry->next;
- if (process(entry->item.any))
- return -1;
+
+ if (entry->directory) {
+ struct tree *tree = lookup_tree(entry->sha1);
+ process_tree(tree);
+ } else {
+ struct blob *blob = lookup_blob(entry->sha1);
+ process(&blob->object);
+ }
free(entry);
entry = next;
}
free(entry);
entry = next;
}
+ free(tree->buffer);
+ tree->buffer = NULL;
return 0;
}
return 0;
}
-#define COMPLETE
1U
-#define
TO_SCAN 4U
-#define
SEEN 16U
+#define COMPLETE
(1U << 0)
+#define
SEEN (1U << 1)
+#define
TO_SCAN (1U << 2)
static struct commit_list *complete = NULL;
static struct commit_list *complete = NULL;
@@
-134,22
+140,16
@@
static int process(struct object *obj)
obj->flags |= SEEN;
if (has_sha1_file(obj->sha1)) {
obj->flags |= SEEN;
if (has_sha1_file(obj->sha1)) {
- parse_object(obj->sha1);
/* We already have it, so we should scan it now. */
/* We already have it, so we should scan it now. */
- if (obj->flags & TO_SCAN)
- return 0;
- object_list_insert(obj, process_queue_end);
- process_queue_end = &(*process_queue_end)->next;
obj->flags |= TO_SCAN;
obj->flags |= TO_SCAN;
- return 0;
+ } else {
+ if (obj->flags & COMPLETE)
+ return 0;
+ prefetch(obj->sha1);
}
}
- if (obj->flags & COMPLETE)
- return 0;
+
object_list_insert(obj, process_queue_end);
process_queue_end = &(*process_queue_end)->next;
object_list_insert(obj, process_queue_end);
process_queue_end = &(*process_queue_end)->next;
-
- prefetch(obj->sha1);
-
return 0;
}
return 0;
}
@@
-169,7
+169,7
@@
static int loop(void)
* the queue because we needed to fetch it first.
*/
if (! (obj->flags & TO_SCAN)) {
* the queue because we needed to fetch it first.
*/
if (! (obj->flags & TO_SCAN)) {
- if (
!has_sha1_file(obj->sha1) &&
fetch(obj->sha1)) {
+ if (fetch(obj->sha1)) {
report_missing(obj->type
? obj->type
: "object", obj->sha1);
report_missing(obj->type
? obj->type
: "object", obj->sha1);
@@
-209,16
+209,12
@@
static int mark_complete(const char *path, const unsigned char *sha1)
int pull(char *target)
{
unsigned char sha1[20];
int pull(char *target)
{
unsigned char sha1[20];
- int fd = -1;
save_commit_buffer = 0;
save_commit_buffer = 0;
- if (write_ref && current_ref) {
- fd = lock_ref_sha1(write_ref, current_ref);
- if (fd < 0)
- return -1;
- }
+ track_object_refs = 0;
- for_each_ref(mark_complete);
+ if (!get_recover)
+ for_each_ref(mark_complete);
if (interpret_target(target, sha1))
return error("Could not interpret %s as something to pull",
if (interpret_target(target, sha1))
return error("Could not interpret %s as something to pull",
@@
-228,12
+224,7
@@
int pull(char *target)
if (loop())
return -1;
if (loop())
return -1;
- if (write_ref) {
- if (current_ref) {
- write_ref_sha1(write_ref, fd, sha1);
- } else {
- write_ref_sha1_unlocked(write_ref, sha1);
- }
- }
+ if (write_ref)
+ write_ref_sha1_unlocked(write_ref, sha1);
return 0;
}
return 0;
}