Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
ls-files: don't try to prune an empty index
[gitweb.git]
/
builtin
/
log.c
diff --git
a/builtin/log.c
b/builtin/log.c
index 8ca1de98943bdc62248ddd31708a6632557c61de..c6362cf92ed799696128a5da6c802813db62fbcf 100644
(file)
--- a/
builtin/log.c
+++ b/
builtin/log.c
@@
-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]))