• Type: Bug
• Resolution: Fixed
• Priority: Major
• Component/s: git-plugin
• Labels:

  • git
  • jgit
  • submodules
• Environment:

  Jenkins 2.53 git-plugin 3.2

1. 

   image-2017-04-11-15-21-38-761.png

   347 kB

   2017-04-11 19:21

[JENKINS-43308] doGenerateSubmoduleConfigurations causes merge error for non-existent tags

Paul Becotte created issue - 2017-04-03 18:27

Mark Waite made changes - 2017-04-03 18:32

Description

Original: Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags.  This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340]   This appears to be the pertinent part of the logs *14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at

New: Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags.  This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340]   This appears to be the pertinent part of the logs {quote}*14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at{quote}

Mark Waite made changes - 2017-04-03 18:33

Description

Original: Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags.  This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340]   This appears to be the pertinent part of the logs {quote}*14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at{quote}

New: Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags.  This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340]   This appears to be the pertinent part of the logs {{*14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at}}

Mark Waite made changes - 2017-04-03 18:33

Description

Original: Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags.  This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340]   This appears to be the pertinent part of the logs {{*14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at}}

New: Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags.  This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340]   This appears to be the pertinent part of the logs {noformat} *14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at {noformat}

Mark Waite made changes - 2017-04-03 18:35

Description

Original: Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags.  This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340]   This appears to be the pertinent part of the logs {noformat} *14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at {noformat}

New: Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags.  This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340]   This appears to be the pertinent part of the logs {noformat} *14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at {noformat}

Mark Waite made changes - 2017-04-03 18:55

Description

Original: Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags.  This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340]   This appears to be the pertinent part of the logs {noformat} *14:05:51* > git tag -l # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10*14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at {noformat}

New: Upgrading the git plugin to version 3.2 broke our pipeline build that depends on submodules. The build complains about not being able to find merge points against old tags.  This appears to be related to the PR for https://issues.jenkins-ci.org/browse/JENKINS-9713 [https://github.com/jenkinsci/git-plugin/pull/340]   This appears to be the pertinent part of the logs {noformat} *14:05:51* > git tag -l # timeout=10 *14:05:52* > git rev-parse refs/tags/cookbook-site-imported-sudo-2.7.1^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/v0.2.0-posthackerati^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/v0.3.0-alpha^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/old-product-system^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/cookbook-site-imported-td-agent-1daa7273d4921986ecf4efc71340c101493df611^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/cookbook-site-imported-users-1.7.0^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/v0.2.9-prealpha-talis^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/demo-stable-preblink^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/v0.3.5-chef-from-scratch-works^\{commit} # timeout=10 *14:05:52* > git rev-parse refs/tags/stats-elasticsearch-being-replaced-by-redshift^\{commit} # timeout=10 [Pipeline] } [Pipeline] // stage [Pipeline] } [Pipeline] // wrap [Pipeline] } [Pipeline] // timestamps [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline hudson.plugins.git.GitException: Error computing merge base at hudson.plugins.git.util.GitUtils.filterTipBranches(GitUtils.java:213) at {noformat}

Mark Waite made changes - 2017-04-11 19:13

Assignee

Original: Mark Waite [ markewaite ]

Paul Becotte made changes - 2017-04-11 19:21

Attachment

New: image-2017-04-11-15-21-38-761.png [ 37106 ]

Mark Waite made changes - 2017-06-27 20:57

Summary

Original: Submodule tags references cause merge error

New: doGenerateSubmoduleConfigurations causes merge error for non-existent tags

Mark Waite made changes - 2017-09-05 04:01

Resolution		New: Fixed [ 1 ]
Status	Original: Open [ 1 ]	New: Resolved [ 5 ]

Mark Waite made changes - 2019-10-23 01:28

Status

Original: Resolved [ 5 ]

New: Closed [ 6 ]