1
1
using System . Collections . Generic ;
2
- using System . Diagnostics ;
3
2
using System . Linq ;
4
3
using LibGit2Sharp ;
5
4
@@ -28,13 +27,12 @@ public static ReleaseDate Execute(IRepository repo, Commit commit, int calculate
28
27
}
29
28
30
29
var vp = FindLatestStableTaggedCommitReachableFrom ( repo , commit ) ;
31
- var latestStable = repo . Lookup < Commit > ( vp . CommitSha ) ;
32
- rd . OriginalDate = latestStable . When ( ) ;
33
- rd . OriginalCommitSha = vp . CommitSha ;
30
+ rd . OriginalDate = vp . When ( ) ;
31
+ rd . OriginalCommitSha = vp . Sha ;
34
32
return rd ;
35
33
}
36
34
37
- static VersionPoint FindLatestStableTaggedCommitReachableFrom ( IRepository repo , Commit commit )
35
+ static Commit FindLatestStableTaggedCommitReachableFrom ( IRepository repo , Commit commit )
38
36
{
39
37
var masterTip = repo . FindBranch ( "master" ) . Tip ;
40
38
var ancestor = repo . Commits . FindMergeBase ( masterTip , commit ) ;
@@ -59,7 +57,7 @@ static VersionPoint FindLatestStableTaggedCommitReachableFrom(IRepository repo,
59
57
return null ;
60
58
}
61
59
62
- static VersionPoint RetrieveStableVersionPointFor ( IEnumerable < Tag > allTags , Commit c )
60
+ static Commit RetrieveStableVersionPointFor ( IEnumerable < Tag > allTags , Commit c )
63
61
{
64
62
var tags = allTags
65
63
. Where ( tag => tag . PeeledTarget ( ) == c )
@@ -80,7 +78,7 @@ static VersionPoint RetrieveStableVersionPointFor(IEnumerable<Tag> allTags, Comm
80
78
var stableTag = tags . Single ( ) ;
81
79
var commit = RetrieveMergeCommit ( stableTag ) ;
82
80
83
- return BuildFrom ( stableTag , commit ) ;
81
+ return commit ;
84
82
}
85
83
86
84
static bool IsStableRelease ( string tagName )
@@ -101,21 +99,6 @@ static Commit RetrieveMergeCommit(Tag stableTag)
101
99
throw new WarningException ( message ) ;
102
100
}
103
101
104
- static VersionPoint BuildFrom ( Tag stableTag , Commit commit )
105
- {
106
- ShortVersion shortVersion ;
107
-
108
- var hasParsed = ShortVersionParser . TryParseMajorMinor ( stableTag . Name , out shortVersion ) ;
109
- Debug . Assert ( hasParsed ) ;
110
-
111
- return new VersionPoint
112
- {
113
- Major = shortVersion . Major ,
114
- Minor = shortVersion . Minor ,
115
- CommitSha = commit . Id . Sha ,
116
- } ;
117
- }
118
-
119
102
120
103
}
121
104
}
0 commit comments