Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

Commit 345ffd9

Browse files
authored
Merge pull request #727 from krylovsk/bugfix/references-sort-timestamps
references: sort: compare author timestamps when commit timestamps are equal. Fixes #725
2 parents 0381008 + e250584 commit 345ffd9

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

references.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ func (s commitSorterer) Len() int {
4747
}
4848

4949
func (s commitSorterer) Less(i, j int) bool {
50-
return s.l[i].Committer.When.Before(s.l[j].Committer.When)
50+
return s.l[i].Committer.When.Before(s.l[j].Committer.When) ||
51+
s.l[i].Committer.When.Equal(s.l[j].Committer.When) &&
52+
s.l[i].Author.When.Before(s.l[j].Author.When)
5153
}
5254

5355
func (s commitSorterer) Swap(i, j int) {

references_test.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,19 @@ var referencesTests = [...]struct {
163163
"1e14f94bcf82694fdc7e2dcbbfdbbed58db0f4d9",
164164
"1e3d328a2cabda5d0aaddc5dec65271343e0dc37",
165165
}},
166-
166+
{"https://github.com/spinnaker/spinnaker.git", "f39d86f59a0781f130e8de6b2115329c1fbe9545", "README.adoc", []string{
167+
"638f61b3331695f46f1a88095e26dea0f09f176b",
168+
"bd42370d3fe8d410e78acb96f81cb3d838ad1c21",
169+
"d6905eab6fec1841c7cf8e4484499f5c8d7d423e",
170+
"c0a70a0f5aa494f0ae01c55ba191f2325556489a",
171+
"811795c8a185e88f5d269195cb68b29c8d0fe170",
172+
"d6e6fe0194447cc280f942d6a2e0521b68ea7796",
173+
"174bdbf9edfb0ca88415dd4a673852d5b22e7036",
174+
"9944d6cf72b8f82d622d85dad7434472bc8f397d",
175+
"e805183c72f0426fb073728c01901c2fd2db1da6",
176+
"8ef83dd443a05e9122681950399edaa58a38d466",
177+
"d73f9cee49a5ad27a42a6e18af7c49a8f28ad8a8",
178+
}},
167179
// FAILS
168180
/*
169181
// this contains an empty move

0 commit comments

Comments
 (0)