Merge pull request #124 from ketan/master

Fallback to detecting latest revision if revisions-since call fails
ashwanthkumar · Aug 2, 2018 · 492af8c · 492af8c
2 parents 2ef6527 + 2512e90
commit 492af8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>in.ashwanthkumar</groupId>
  <artifactId>gocd-github-pr-material</artifactId>
- <version>1.3.4</version>
+ <version>1.3.5</version>
 
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/in/ashwanthkumar/gocd/github/GitHubPRBuildPlugin.java b/src/main/java/in/ashwanthkumar/gocd/github/GitHubPRBuildPlugin.java
@@ -311,7 +311,12 @@ GoPluginApiResponse handleLatestRevisionSince(GoPluginApiRequest goPluginApiRequ
  String latestSHA = newerRevisions.get(branch);
  if(StringUtils.isNotEmpty(lastKnownSHA)) {
  git.resetHard(latestSHA);
- List<Revision> allRevisionsSince = git.getRevisionsSince(lastKnownSHA);
+ List<Revision> allRevisionsSince;
+ try {
+ allRevisionsSince = git.getRevisionsSince(lastKnownSHA);
+ } catch (Exception e) {
+ allRevisionsSince = Collections.singletonList(git.getLatestRevision());
+ }
  List<Map<String, Object>> changesSinceLastCommit = Lists.map(allRevisionsSince, new Function<Revision, Map<String, Object>>() {
  @Override
  public Map<String, Object> apply(Revision revision) {