This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a273365 Update ParseGitBranch to assume master if more than one line
of info returned from git branch.
new 930cfbe Merge pull request #1518 from
neilcsmith-net/build-branding-quick-fix
a273365 is described below
commit a273365cbbac7df3d4911daec78bf6657f60b608
Author: Neil C Smith <[email protected]>
AuthorDate: Thu Sep 19 11:39:55 2019 +0100
Update ParseGitBranch to assume master if more than one line of info
returned from git branch.
---
nbbuild/antsrc/org/netbeans/nbbuild/ParseGitBranch.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ParseGitBranch.java
b/nbbuild/antsrc/org/netbeans/nbbuild/ParseGitBranch.java
index b3b61b7..0c66f31 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/ParseGitBranch.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/ParseGitBranch.java
@@ -61,11 +61,11 @@ public class ParseGitBranch extends Task {
} catch (IOException ex) {
throw new BuildException("Problem reading information for detached
head");
}
- if (secondLine != null) {
- throw new BuildException("Problem parsing git information for
detached head : too many line");
- }
- if (firstLine == null || firstLine.trim().isEmpty()) {
- // PullRequest assume master ?
+ //if (secondLine != null) {
+ // throw new BuildException("Problem parsing git information for
detached head : too many line");
+ //}
+ if (secondLine != null || firstLine == null ||
firstLine.trim().isEmpty()) {
+ // Assume master if PR or detached HEAD on Travis, etc.
getProject().setProperty(propertyName, "master");
} else {
String[] splited = firstLine.trim().split(" ");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
