Merge branch 'rs/use-div-round-up'

Code cleanup.

* rs/use-div-round-up:
  use DIV_ROUND_UP
This commit is contained in:
Junio C Hamano
2017-07-12 15:18:23 -07:00
9 changed files with 14 additions and 15 deletions

View File

@ -1308,7 +1308,7 @@ static struct commit *get_base_commit(const char *base_commit,
if (rev_nr % 2)
rev[i] = rev[2 * i];
rev_nr = (rev_nr + 1) / 2;
rev_nr = DIV_ROUND_UP(rev_nr, 2);
}
if (!in_merge_bases(base, rev[0]))