Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-9914

Merge before build setting lost/reset on each configure

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Resolved (View Workflow)
    • Priority: Major
    • Resolution: Fixed
    • Component/s: git-plugin
    • Labels:
      None
    • Similar Issues:

      Description

      I've configured Merge options: Merge before build and entered a repository and branch to merge. Saving this config works OK, however each time I re-configure the job, I need to re-select this option and re-enter the repository and branch, because it is reset (Merge before build comes up unchecked). Saving the configuration causes the Merge before build to be turned off unless I remember to fill in the values again.

      I have Jenkins 1.414 with Git plugin 1.1.9. Another server with 1.413 / 1.1.8 does not have this issue.

        Attachments

          Activity

          Hide
          landers Dave Landers added a comment -

          Another server with git 1.1.9 on Jenkins 1.406 also has this problem, so it seems to be in the git plugin 1.1.9

          Show
          landers Dave Landers added a comment - Another server with git 1.1.9 on Jenkins 1.406 also has this problem, so it seems to be in the git plugin 1.1.9
          Hide
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Kohsuke Kawaguchi
          Path:
          src/main/java/hudson/plugins/git/BranchSpec.java
          src/main/java/hudson/plugins/git/GitPublisher.java
          src/main/java/hudson/plugins/git/GitSCM.java
          src/main/java/hudson/plugins/git/UserMergeOptions.java
          src/main/resources/hudson/plugins/git/GitSCM/config.jelly
          src/main/resources/hudson/plugins/git/GitSCM/help-userMergeOptions.html
          src/main/resources/hudson/plugins/git/UserMergeOptions/config.jelly
          src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeRemote.html
          src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeTarget.html
          src/main/webapp/branch.html
          src/main/webapp/merge.html
          http://jenkins-ci.org/commit/git-plugin/e4dcecefca2cc5ba248c20d72bbbd362aaf258dc
          Log:
          [FIXED JENKINS-9914] Using proper databinding scheme and adding help for these fields.

          Compare: https://github.com/jenkinsci/git-plugin/compare/d57ba71...e4dcece

          Show
          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Kohsuke Kawaguchi Path: src/main/java/hudson/plugins/git/BranchSpec.java src/main/java/hudson/plugins/git/GitPublisher.java src/main/java/hudson/plugins/git/GitSCM.java src/main/java/hudson/plugins/git/UserMergeOptions.java src/main/resources/hudson/plugins/git/GitSCM/config.jelly src/main/resources/hudson/plugins/git/GitSCM/help-userMergeOptions.html src/main/resources/hudson/plugins/git/UserMergeOptions/config.jelly src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeRemote.html src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeTarget.html src/main/webapp/branch.html src/main/webapp/merge.html http://jenkins-ci.org/commit/git-plugin/e4dcecefca2cc5ba248c20d72bbbd362aaf258dc Log: [FIXED JENKINS-9914] Using proper databinding scheme and adding help for these fields. Compare: https://github.com/jenkinsci/git-plugin/compare/d57ba71...e4dcece
          Hide
          dogfood dogfood added a comment -

          Integrated in plugins_git-plugin #214
          [FIXED JENKINS-9914] Using proper databinding scheme and adding help for these fields.

          Kohsuke Kawaguchi : e4dcecefca2cc5ba248c20d72bbbd362aaf258dc
          Files :

          • src/main/java/hudson/plugins/git/GitSCM.java
          • src/main/java/hudson/plugins/git/GitPublisher.java
          • src/main/webapp/merge.html
          • src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeTarget.html
          • src/main/java/hudson/plugins/git/UserMergeOptions.java
          • src/main/resources/hudson/plugins/git/GitSCM/config.jelly
          • src/main/resources/hudson/plugins/git/UserMergeOptions/config.jelly
          • src/main/java/hudson/plugins/git/BranchSpec.java
          • src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeRemote.html
          • src/main/resources/hudson/plugins/git/GitSCM/help-userMergeOptions.html
          • src/main/webapp/branch.html
          Show
          dogfood dogfood added a comment - Integrated in plugins_git-plugin #214 [FIXED JENKINS-9914] Using proper databinding scheme and adding help for these fields. Kohsuke Kawaguchi : e4dcecefca2cc5ba248c20d72bbbd362aaf258dc Files : src/main/java/hudson/plugins/git/GitSCM.java src/main/java/hudson/plugins/git/GitPublisher.java src/main/webapp/merge.html src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeTarget.html src/main/java/hudson/plugins/git/UserMergeOptions.java src/main/resources/hudson/plugins/git/GitSCM/config.jelly src/main/resources/hudson/plugins/git/UserMergeOptions/config.jelly src/main/java/hudson/plugins/git/BranchSpec.java src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeRemote.html src/main/resources/hudson/plugins/git/GitSCM/help-userMergeOptions.html src/main/webapp/branch.html

            People

            • Assignee:
              abayer Andrew Bayer
              Reporter:
              landers Dave Landers
            • Votes:
              2 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: