diff options
| -rw-r--r-- | http-fetch.c | 3 | ||||
| -rw-r--r-- | remote-curl.c | 3 | ||||
| -rw-r--r-- | walker.c | 19 | ||||
| -rw-r--r-- | walker.h | 3 |
4 files changed, 8 insertions, 20 deletions
diff --git a/http-fetch.c b/http-fetch.c index a1564f5a41..7b855d3349 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -56,9 +56,6 @@ int cmd_main(int argc, const char **argv) http_init(NULL, url, 0); walker = get_http_walker(url); - walker->get_tree = 1; - walker->get_history = 1; - walker->get_all = 1; walker->get_verbosely = get_verbosely; walker->get_recover = get_recover; diff --git a/remote-curl.c b/remote-curl.c index a7c4c9b5ff..dd86a6c4fa 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -797,9 +797,6 @@ static int fetch_dumb(int nr_heads, struct ref **to_fetch) targets[i] = xstrdup(oid_to_hex(&to_fetch[i]->old_oid)); walker = get_http_walker(url.buf); - walker->get_all = 1; - walker->get_tree = 1; - walker->get_history = 1; walker->get_verbosely = options.verbosity >= 3; walker->get_recover = 0; ret = walker_fetch(walker, nr_heads, targets, NULL, NULL); @@ -72,6 +72,8 @@ static struct commit_list *complete = NULL; static int process_commit(struct walker *walker, struct commit *commit) { + struct commit_list *parents; + if (parse_commit(commit)) return -1; @@ -86,19 +88,14 @@ static int process_commit(struct walker *walker, struct commit *commit) walker_say(walker, "walk %s\n", oid_to_hex(&commit->object.oid)); - if (walker->get_tree) { - if (process(walker, &commit->tree->object)) + if (process(walker, &commit->tree->object)) + return -1; + + for (parents = commit->parents; parents; parents = parents->next) { + if (process(walker, &parents->item->object)) return -1; - if (!walker->get_all) - walker->get_tree = 0; - } - if (walker->get_history) { - struct commit_list *parents = commit->parents; - for (; parents; parents = parents->next) { - if (process(walker, &parents->item->object)) - return -1; - } } + return 0; } @@ -9,9 +9,6 @@ struct walker { void (*prefetch)(struct walker *, unsigned char *sha1); int (*fetch)(struct walker *, unsigned char *sha1); void (*cleanup)(struct walker *); - int get_tree; - int get_history; - int get_all; int get_verbosely; int get_recover; |