Skip to content

Commit 2e81d63

Browse files
committed
Run git commands in init of GitAdapter. Fixes #295
1 parent 3c6987b commit 2e81d63

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/main/groovy/net/researchgate/release/GitAdapter.groovy

+8-5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class GitAdapter extends BaseScmAdapter {
2424
private static final String AHEAD = 'ahead'
2525
private static final String BEHIND = 'behind'
2626

27-
private final String workingBranch
28-
private final String releaseBranch
27+
private String workingBranch
28+
private String releaseBranch
2929

3030
private File workingDirectory
3131

@@ -52,9 +52,6 @@ class GitAdapter extends BaseScmAdapter {
5252

5353
GitAdapter(Project project, Map<String, Object> attributes) {
5454
super(project, attributes)
55-
56-
workingBranch = gitCurrentBranch()
57-
releaseBranch = extension.pushReleaseVersionBranch ? extension.pushReleaseVersionBranch : workingBranch
5855
}
5956

6057
@Override
@@ -74,6 +71,12 @@ class GitAdapter extends BaseScmAdapter {
7471

7572
@Override
7673
void init() {
74+
workingBranch = gitCurrentBranch()
75+
if (extension.pushReleaseVersionBranch) {
76+
releaseBranch = extension.pushReleaseVersionBranch
77+
} else {
78+
releaseBranch = workingBranch
79+
}
7780
if (extension.git.requireBranch) {
7881
if (!(workingBranch ==~ extension.git.requireBranch)) {
7982
throw new GradleException("Current Git branch is \"$workingBranch\" and not \"${ extension.git.requireBranch }\".")

0 commit comments

Comments
 (0)