[JENKINS-43507] Fix invalid implicit assumption that remote name is a…

…lways `origin`
jenkinsci · Jun 12, 2017 · aaaa28b2e3ed0f094a66e54c3266a63a9da7965c · aaaa28b
1 parent 7fd9e9f
commit aaaa28b2e3ed0f094a66e54c3266a63a9da7965c
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 src/main/java/jenkins/plugins/git/GitSCMSource.java
diff --git a/src/main/java/jenkins/plugins/git/GitSCMSource.java b/src/main/java/jenkins/plugins/git/GitSCMSource.java
@@ -168,7 +168,7 @@ public GitSCMSource(String id, String remote, String credentialsId, String remot
         if (!DEFAULT_INCLUDES.equals(includes) || !DEFAULT_EXCLUDES.equals(excludes)) {
             traits.add(new WildcardSCMHeadFilterTrait(includes, excludes));
         }
-        if (!"origin".equals(remoteName) && StringUtils.isNotBlank(remoteName)) {
+        if (!DEFAULT_REMOTE_NAME.equals(remoteName) && StringUtils.isNotBlank(remoteName)) {
             traits.add(new RemoteNameSCMSourceTrait(remoteName));
         }
         if (ignoreOnPushNotifications) {
@@ -218,7 +218,7 @@ private Object readResolve() throws ObjectStreamException {
                     }
                 }
             }
-            if (remoteName != null && !"origin".equals(remoteName) && StringUtils.isNotBlank(remoteName)) {
+            if (remoteName != null && !DEFAULT_REMOTE_NAME.equals(remoteName) && StringUtils.isNotBlank(remoteName)) {
                 traits.add(new RemoteNameSCMSourceTrait(remoteName));
             }
             if (StringUtils.isNotBlank(gitTool)) {