Merge branch 'jk/reflog-walk' into maint

[git-core/git.git] / builtin / log.c

diff --git a/builtin/log.c b/builtin/log.c
index 630d6cf..5ffc380 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1311,7 +1311,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]))