summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2018-04-22 18:12:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-24 01:55:04 (GMT)
commit0b6b34295413410e4ca52df4671d2a217e56a57b (patch)
tree9e02df32fe16de0beb8f2cc7103174a6e7d5a7b0
parent2e85a0c8abe29f9adad2ec0a977629ba90723973 (diff)
downloadgit-0b6b34295413410e4ca52df4671d2a217e56a57b.zip
git-0b6b34295413410e4ca52df4671d2a217e56a57b.tar.gz
git-0b6b34295413410e4ca52df4671d2a217e56a57b.tar.bz2
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>
-rw-r--r--http-fetch.c3
-rw-r--r--remote-curl.c3
-rw-r--r--walker.c19
-rw-r--r--walker.h3
4 files changed, 8 insertions, 20 deletions
diff --git a/http-fetch.c b/http-fetch.c
index a1564f5..7b855d3 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 a7c4c9b..dd86a6c 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);
diff --git a/walker.c b/walker.c
index dffb9c8..8eb7db7 100644
--- a/walker.c
+++ b/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;
}
diff --git a/walker.h b/walker.h
index a869013..6d8ae00 100644
--- a/walker.h
+++ b/walker.h
@@ -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;