undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* kk/revwalk-slop-too-many-commit-within-a-second:
  Fix revision walk for commits with the same dates
This commit is contained in:
Junio C Hamano 2013-04-03 08:44:02 -07:00
commit 64379806a9
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
revision.c
View File

@ -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 * Does the destination list contain entries with a date
* before the source list? Definitely _not_ done. * before the source list? Definitely _not_ done.
*/ */
if (date < src->item->date) if (date <= src->item->date)
return SLOP; return SLOP;
/* /*

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

@ -133,4 +133,17 @@ test_expect_success 'dodecapus' '
check_revlist "--min-parents=13" && check_revlist "--min-parents=13" &&
check_revlist "--min-parents=4 --max-parents=11" tetrapus 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 test_done