@@ -24,8 +24,8 @@ class GitAdapter extends BaseScmAdapter {
24
24
private static final String AHEAD = ' ahead'
25
25
private static final String BEHIND = ' behind'
26
26
27
- private final String workingBranch
28
- private final String releaseBranch
27
+ private String workingBranch
28
+ private String releaseBranch
29
29
30
30
private File workingDirectory
31
31
@@ -52,9 +52,6 @@ class GitAdapter extends BaseScmAdapter {
52
52
53
53
GitAdapter (Project project , Map<String , Object > attributes ) {
54
54
super (project, attributes)
55
-
56
- workingBranch = gitCurrentBranch()
57
- releaseBranch = extension. pushReleaseVersionBranch ? extension. pushReleaseVersionBranch : workingBranch
58
55
}
59
56
60
57
@Override
@@ -74,6 +71,12 @@ class GitAdapter extends BaseScmAdapter {
74
71
75
72
@Override
76
73
void init () {
74
+ workingBranch = gitCurrentBranch()
75
+ if (extension. pushReleaseVersionBranch) {
76
+ releaseBranch = extension. pushReleaseVersionBranch
77
+ } else {
78
+ releaseBranch = workingBranch
79
+ }
77
80
if (extension. git. requireBranch) {
78
81
if (! (workingBranch ==~ extension. git. requireBranch)) {
79
82
throw new GradleException (" Current Git branch is \" $workingBranch \" and not \" ${ extension.git.requireBranch } \" ." )
0 commit comments