Browse Source

Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1

* kk/revwalk-slop-too-many-commit-within-a-second:
  Fix revision walk for commits with the same dates
maint
Junio C Hamano 12 years ago
parent
commit
64379806a9
  1. 2
      revision.c
  2. 13
      t/t6009-rev-list-parent.sh

2
revision.c

@ -708,7 +708,7 @@ static int still_interesting(struct commit_list *src, unsigned long date, int sl @@ -708,7 +708,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;

/*

13
t/t6009-rev-list-parent.sh

@ -133,4 +133,17 @@ test_expect_success 'dodecapus' ' @@ -133,4 +133,17 @@ test_expect_success 'dodecapus' '
check_revlist "--min-parents=13" &&
check_revlist "--min-parents=4 --max-parents=11" tetrapus
'

test_expect_success 'ancestors with the same commit time' '

test_tick_keep=$test_tick &&
for i in 1 2 3 4 5 6 7 8; do
test_tick=$test_tick_keep
test_commit t$i
done &&
git rev-list t1^! --not t$i >result &&
>expect &&
test_cmp expect result
'

test_done

Loading…
Cancel
Save