@@ -97,28 +97,31 @@ public CurrentTreeish CurrentLocalTreeish()
97
97
{
98
98
logger . LogInformation ( $ "{ "[" + ModuleName + "]" , - 30 } Getting current treeish") ;
99
99
100
- var ( exitCode , output , _) = shellRunner . RunInDirectory ( RepoPath , "git rev-parse --abbrev-ref HEAD" ) ;
100
+ var ( exitCode , branchName , _) = shellRunner . RunInDirectory ( RepoPath , "git rev-parse --abbrev-ref HEAD" ) ;
101
101
102
- output = output . Trim ( ) ;
103
- if ( output != "HEAD" )
104
- return new CurrentTreeish ( TreeishType . Branch , output ) ;
102
+ branchName = branchName . Trim ( ) ;
103
+ if ( branchName != "HEAD" )
104
+ return new CurrentTreeish ( TreeishType . Branch , branchName ) ;
105
105
106
106
if ( exitCode != 0 )
107
107
{
108
108
return new CurrentTreeish ( TreeishType . Branch , "master" ) ;
109
109
}
110
110
111
111
// todo(dstarasov): не проверяется exitCode
112
- var ( _, output2 , _) = shellRunner . RunInDirectory ( RepoPath , "git describe --tags --exact-match" ) ;
113
- var tags = output2 . Trim ( ) ;
112
+ var ( _, tags , _) = shellRunner . RunInDirectory ( RepoPath , "git describe --tags --exact-match" ) ;
113
+ tags = tags . Trim ( ) ;
114
+
114
115
if ( tags . Length > 0 )
115
116
{
116
117
return new CurrentTreeish ( TreeishType . Tag , tags ) ;
117
118
}
118
119
119
120
// todo(dstarasov): не проверяется exitCode
120
- var ( _, output3 , _) = shellRunner . RunInDirectory ( RepoPath , "git rev-parse HEAD" ) ;
121
- return new CurrentTreeish ( TreeishType . CommitHash , output3 . Trim ( ) ) ;
121
+ var ( _, commitHash , _) = shellRunner . RunInDirectory ( RepoPath , "git rev-parse HEAD" ) ;
122
+ commitHash = commitHash . Trim ( ) ;
123
+
124
+ return new CurrentTreeish ( TreeishType . CommitHash , commitHash ) ;
122
125
}
123
126
124
127
public string SafeGetCurrentLocalCommitHash ( string treeish = null )
0 commit comments