walker: drop fields of struct walker
which are always 1
After the previous commit, both users of `struct walker` set `get_tree`, `get_history` and `get_all` to 1. Drop those fields and simplify the walker implementation accordingly. Let's hope that any out-of-tree users will not mind this change. They should notice that the compilation fails as they try to set these fields. (If they do not set them, note that `get_http_walker()` leaves them undefined, so the behavior will have been undefined all the time.) Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2e85a0c8ab
commit
0b6b342954
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
19
walker.c
19
walker.c
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user