bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sigar-1.6'

This commit is contained in:
Doug MacEachern 2010-04-04 10:26:06 -07:00
parent ccbd22fad6 6a0cd93cf5
commit cf22b7f0a1
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
View File

@ -177,8 +177,18 @@ public class ArchNameTask extends Task {
String head = readLine(git + "/HEAD"); String head = readLine(git + "/HEAD");
if (head != null) { if (head != null) {
String ref = head.substring(5).trim(); //'ref: ' String sha1;
return readLine(git + "/" + ref).substring(0, 7); final String refp = "ref: ";
if (head.startsWith(refp)) {
//branch
String ref = head.substring(refp.length()).trim();
sha1 = readLine(git + "/" + ref);
}
else {
//git checkout -f origin/branch-name (no branch)
sha1 = head;
}
return sha1.substring(0, 7);
} }
} }
return null; return null;