diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 14:38:25 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 14:38:25 -0700 |
commit | 74bd52681d7c57907bef129cdffb6cd0f2895115 (patch) | |
tree | c5c75b549a4cfd2c3804faaedb71534cb90e6576 /revision.c | |
parent | 4806c8c5cae6864f7a478be3b32b3aa354aaad66 (diff) | |
parent | c19d1b4e840535c5fc27077194e8ac219c02644c (diff) | |
download | git-74bd52681d7c57907bef129cdffb6cd0f2895115.tar.gz git-74bd52681d7c57907bef129cdffb6cd0f2895115.tar.xz |
Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second'
Allow the revision "slop" code to look deeper while commits with
exactly the same timestamps come next to each other (which can
often happen after a large "am" and "rebase" session).
* kk/revwalk-slop-too-many-commit-within-a-second:
Fix revision walk for commits with the same dates
Diffstat (limited to 'revision.c')
-rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 78397d648..71e62d831 100644 --- a/revision.c +++ b/revision.c @@ -709,7 +709,7 @@ static int still_interesting(struct commit_list *src, unsigned long date, int sl * Does the destination list contain entries with a date * before the source list? Definitely _not_ done. */ - if (date < src->item->date) + if (date <= src->item->date) return SLOP; /* |