Skip to content

Commit f77983f

Browse files
committed
revision: drop unused "list" parameter from process_parents()
Everybody passes NULL, so we can get rid of the weird "sometimes list, sometimes queue" structure.
1 parent 3867563 commit f77983f

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

revision.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
11391139
}
11401140

11411141
static int process_parents(struct rev_info *revs, struct commit *commit,
1142-
struct commit_list **list, struct prio_queue *queue)
1142+
struct prio_queue *queue)
11431143
{
11441144
struct commit_list *parent = commit->parents;
11451145
unsigned pass_flags;
@@ -1180,8 +1180,6 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
11801180
if (p->object.flags & SEEN)
11811181
continue;
11821182
p->object.flags |= (SEEN | NOT_USER_GIVEN);
1183-
if (list)
1184-
commit_list_insert_by_date(p, list);
11851183
if (queue)
11861184
prio_queue_put(queue, p);
11871185
if (revs->exclude_first_parent_only)
@@ -1229,8 +1227,6 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
12291227
p->object.flags |= pass_flags;
12301228
if (!(p->object.flags & SEEN)) {
12311229
p->object.flags |= (SEEN | NOT_USER_GIVEN);
1232-
if (list)
1233-
commit_list_insert_by_date(p, list);
12341230
if (queue)
12351231
prio_queue_put(queue, p);
12361232
}
@@ -1490,7 +1486,7 @@ static int limit_list(struct rev_info *revs)
14901486

14911487
if (revs->max_age != -1 && (commit->date < revs->max_age))
14921488
obj->flags |= UNINTERESTING;
1493-
if (process_parents(revs, commit, NULL, &revs->commits) < 0)
1489+
if (process_parents(revs, commit, &revs->commits) < 0)
14941490
return -1;
14951491
if (obj->flags & UNINTERESTING) {
14961492
mark_parents_uninteresting(revs, commit);
@@ -3729,7 +3725,7 @@ static void explore_walk_step(struct rev_info *revs)
37293725
if (revs->max_age != -1 && (c->date < revs->max_age))
37303726
c->object.flags |= UNINTERESTING;
37313727

3732-
if (process_parents(revs, c, NULL, NULL) < 0)
3728+
if (process_parents(revs, c, NULL) < 0)
37333729
return;
37343730

37353731
if (c->object.flags & UNINTERESTING)
@@ -3905,7 +3901,7 @@ static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
39053901
{
39063902
struct commit_list *p;
39073903
struct topo_walk_info *info = revs->topo_walk_info;
3908-
if (process_parents(revs, commit, NULL, NULL) < 0) {
3904+
if (process_parents(revs, commit, NULL) < 0) {
39093905
if (!revs->ignore_missing_links)
39103906
die("Failed to traverse parents of commit %s",
39113907
oid_to_hex(&commit->object.oid));
@@ -4015,7 +4011,7 @@ static enum rewrite_result rewrite_one(struct rev_info *revs,
40154011
for (;;) {
40164012
struct commit *p = *pp;
40174013
if (!revs->limited)
4018-
if (process_parents(revs, p, NULL, &revs->commits) < 0)
4014+
if (process_parents(revs, p, &revs->commits) < 0)
40194015
return rewrite_one_error;
40204016
if (p->object.flags & UNINTERESTING)
40214017
return rewrite_one_ok;
@@ -4350,7 +4346,7 @@ static struct commit *get_revision_1(struct rev_info *revs)
43504346
try_to_simplify_commit(revs, commit);
43514347
else if (revs->topo_walk_info)
43524348
expand_topo_walk(revs, commit);
4353-
else if (process_parents(revs, commit, NULL, &revs->commits) < 0) {
4349+
else if (process_parents(revs, commit, &revs->commits) < 0) {
43544350
if (!revs->ignore_missing_links)
43554351
die("Failed to traverse parents of commit %s",
43564352
oid_to_hex(&commit->object.oid));

0 commit comments

Comments
 (0)