X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=commit-reach.c;h=50175b159e709ef75e01e7c8380fef127d83d408;hb=4c7eb63d2d4ad6d88a336357baaa6a934b604eda;hp=efd5925cbb826e563c1a2040b506f9d9148d1d18;hpb=5b53175b7a03a08c05ad5b2874bb48f07918c9ed;p=thirdparty%2Fgit.git diff --git a/commit-reach.c b/commit-reach.c index efd5925cbb..50175b159e 100644 --- a/commit-reach.c +++ b/commit-reach.c @@ -321,7 +321,7 @@ int repo_in_merge_bases_many(struct repository *r, struct commit *commit, { struct commit_list *bases; int ret = 0, i; - uint32_t generation, min_generation = GENERATION_NUMBER_INFINITY; + uint32_t generation, max_generation = GENERATION_NUMBER_ZERO; if (repo_parse_commit(r, commit)) return ret; @@ -330,12 +330,12 @@ int repo_in_merge_bases_many(struct repository *r, struct commit *commit, return ret; generation = commit_graph_generation(reference[i]); - if (generation < min_generation) - min_generation = generation; + if (generation > max_generation) + max_generation = generation; } generation = commit_graph_generation(commit); - if (generation > min_generation) + if (generation > max_generation) return ret; bases = paint_down_to_common(r, commit,