Merge tag 'v2.13.5' into maint

diff --git a/builtin/log.c b/builtin/log.c
index 998437b23dcb32a45e4d722d695c86d3cc82b4bc..c6362cf92ed799696128a5da6c802813db62fbcf 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -5,6 +5,7 @@
  *              2006 Junio Hamano
  */
 #include "cache.h"
+#include "config.h"
 #include "refs.h"
 #include "color.h"
 #include "commit.h"
@@ -1307,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]))