[JENKINS-34395] Revert changes to test data and fix filesystem when u…

…sing a hash rather than a ref
jenkinsci · Sep 7, 2017 · 41e016f · 41e016f
1 parent 6f9ee58
commit 41e016f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMFile.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMFile.java
@@ -138,7 +138,7 @@ protected SCMFile newChild(String name, boolean assumeIsDirectory) {
     @Override
     public Iterable<SCMFile> children() throws IOException {
         checkOpen();
-        List<GHContent> content = repo.getDirectoryContent(getPath(), Constants.R_REFS + ref);
+        List<GHContent> content = repo.getDirectoryContent(getPath(), ref.indexOf('/') == -1 ? ref : Constants.R_REFS + ref);
         List<SCMFile> result = new ArrayList<>(content.size());
         for (GHContent c : content) {
             result.add(new GitHubSCMFile(this, c.getName(), c));

diff --git a/src/test/resources/api/mappings/mapping-yolo-contents-64985.json b/src/test/resources/api/mappings/mapping-yolo-contents-64985.json
@@ -1,6 +1,6 @@
 {
   "request" : {
-    "url" : "/repos/cloudbeers/yolo/contents/?ref=pull%2F2%2Fhead",
+    "url" : "/repos/cloudbeers/yolo/contents/?ref=refs%2Fpull%2F2%2Fhead",
     "method" : "GET"
   },
   "response" : {

diff --git a/src/test/resources/api/mappings/mapping-yolo-contents-8rd37.json b/src/test/resources/api/mappings/mapping-yolo-contents-8rd37.json
@@ -1,6 +1,6 @@
 {
   "request" : {
-    "url" : "/repos/cloudbeers/yolo/contents/?ref=pull%2F2%2Fmerge",
+    "url" : "/repos/cloudbeers/yolo/contents/?ref=refs%2Fpull%2F2%2Fmerge",
     "method" : "GET"
   },
   "response" : {

diff --git a/src/test/resources/api/mappings/mapping-yolo-contents-DRrwo.json b/src/test/resources/api/mappings/mapping-yolo-contents-DRrwo.json
@@ -1,6 +1,6 @@
 {
   "request" : {
-    "url" : "/repos/cloudbeers/yolo/contents/?ref=heads%2Fmaster",
+    "url" : "/repos/cloudbeers/yolo/contents/?ref=refs%2Fheads%2Fmaster",
     "method" : "GET"
   },
   "response" : {

diff --git a/src/test/resources/api/mappings/mapping-yolo-contents-pcVDb.json b/src/test/resources/api/mappings/mapping-yolo-contents-pcVDb.json
@@ -1,6 +1,6 @@
 {
   "request" : {
-    "url" : "/repos/cloudbeers/yolo/contents/?ref=heads%2Fstephenc-patch-1",
+    "url" : "/repos/cloudbeers/yolo/contents/?ref=refs%2Fheads%2Fstephenc-patch-1",
     "method" : "GET"
   },
   "response" : {