[FIXED JENKINS-27383] Don't attempt to fetch tag message when no tag …

…was found.
jenkinsci · Mar 12, 2015 · 1fb0506 · 1fb0506
1 parent dbe1928
commit 1fb0506
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/gittagmessage/GitTagMessageExtension.java b/src/main/java/org/jenkinsci/plugins/gittagmessage/GitTagMessageExtension.java
@@ -16,6 +16,7 @@
 import java.util.logging.Logger;
 
 import static hudson.Util.fixEmpty;
+import static hudson.Util.fixEmptyAndTrim;
 
 public class GitTagMessageExtension extends GitSCMExtension {
 
@@ -49,6 +50,9 @@ public void onCheckoutCompleted(GitSCM scm, AbstractBuild<?, ?> build, GitClient
         } else {
             // This build was triggered for a named branch, or for a particular commit hash
             tagName = getTagName(git, commit);
+            if (tagName == null) {
+                return;
+            }
         }
 
         // Retrieve the tag message for the given tag name, then store it
@@ -70,6 +74,7 @@ private static String getTagName(GitClient git, String commit) throws Interrupte
             // This should return a tag name (e.g. "beta42") or the nearest tag name and an offset ("beta42-5-g123abcd")
             tagDescription = fixEmpty(git.describe(commit)); // "git describe --tags <commit>"
         } catch (GitException e) {
+            // If there are no tags nearby, git returns a non-zero exit code, which throws this exception
             LOGGER.warning(String.format("Fetching tag info for '%s' threw exception: %s", commit, e.getMessage()));
         }
         if (tagDescription == null) {
@@ -83,7 +88,7 @@ private static String getTagName(GitClient git, String commit) throws Interrupte
             return null;
         }
 
-        return tagDescription;
+        return fixEmptyAndTrim(tagDescription);
     }
 
     @Extension