Branch: refs/heads/master
Home: https://github.com/jenkinsci/git-plugin
Commit: 5bdffc3f1cea6836a108d1de618b70dbb1b0cb73
https://github.com/jenkinsci/git-plugin/commit/5bdffc3f1cea6836a108d1de618b70dbb1b0cb73
Author: Marshall Galbraith <[email protected]>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
M src/test/java/hudson/plugins/git/AbstractGitTestCase.java
M src/test/java/hudson/plugins/git/GitSCMTest.java
Log Message:
-----------
Created a unit test that reproduces JENKINS-23179
Commit: 288332ceae9a315140426334dd48907a12be2fdf
https://github.com/jenkinsci/git-plugin/commit/288332ceae9a315140426334dd48907a12be2fdf
Author: Marshall Galbraith <[email protected]>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
Log Message:
-----------
[FIXED JENKINS-23179] git pre-merge fails with matrix project
Commit: aae316735fd0360e8ae59282f94cef8c58674a18
https://github.com/jenkinsci/git-plugin/commit/aae316735fd0360e8ae59282f94cef8c58674a18
Author: Marshall Galbraith <[email protected]>
Date: 2014-07-01 (Tue, 01 Jul 2014)
Changed paths:
M src/test/java/hudson/plugins/git/GitSCMTest.java
Log Message:
-----------
Removed commented out code
Commit: 61314fbfcaa81c7152b7ed5f3104e44e84080bb0
https://github.com/jenkinsci/git-plugin/commit/61314fbfcaa81c7152b7ed5f3104e44e84080bb0
Author: Marshall Galbraith <[email protected]>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M pom.xml
M src/main/java/hudson/plugins/git/BranchSpec.java
M src/main/java/hudson/plugins/git/GitChangeLogParser.java
M src/main/java/hudson/plugins/git/GitChangeSet.java
M src/main/java/hudson/plugins/git/GitChangeSetList.java
M src/main/java/hudson/plugins/git/GitPublisher.java
M src/main/java/hudson/plugins/git/GitSCM.java
M src/main/java/hudson/plugins/git/GitStatus.java
M src/main/java/hudson/plugins/git/GitTagAction.java
R src/main/java/hudson/plugins/git/MultipleScmResolver.java
M src/main/java/hudson/plugins/git/extensions/GitSCMExtension.java
M src/main/java/hudson/plugins/git/extensions/impl/CleanCheckout.java
M src/main/java/hudson/plugins/git/extensions/impl/CloneOption.java
M src/main/java/hudson/plugins/git/extensions/impl/PerBuildTag.java
M src/main/java/hudson/plugins/git/extensions/impl/PreBuildMerge.java
M
src/main/java/hudson/plugins/git/extensions/impl/RelativeTargetDirectory.java
M src/main/java/hudson/plugins/git/extensions/impl/ScmName.java
M src/main/java/hudson/plugins/git/extensions/impl/SparseCheckoutPaths.java
M src/main/java/hudson/plugins/git/extensions/impl/SubmoduleOption.java
M src/main/java/hudson/plugins/git/extensions/impl/WipeWorkspace.java
M src/main/java/hudson/plugins/git/opt/PreBuildMergeOptions.java
M src/main/java/hudson/plugins/git/util/BuildChooserContext.java
M src/main/java/hudson/plugins/git/util/GitUtils.java
M src/main/resources/hudson/plugins/git/GitChangeSetList/index.jelly
M src/main/resources/hudson/plugins/git/GitSCM/project-changes.jelly
M src/main/resources/hudson/plugins/git/GitTagAction/tagForm.jelly
M src/test/java/hudson/plugins/git/GitChangeLogParserTest.java
M src/test/java/hudson/plugins/git/GitSCMTest.java
M src/test/java/hudson/plugins/git/MultipleSCMTest.java
M src/test/java/hudson/plugins/git/TestGitRepo.java
M src/test/java/hudson/plugins/git/browser/BitbucketWebTest.java
M src/test/java/hudson/plugins/git/browser/GitWebTest.java
M src/test/java/hudson/plugins/git/browser/GithubWebTest.java
M src/test/java/hudson/plugins/git/browser/GitoriousWebTest.java
M src/test/java/hudson/plugins/git/browser/KilnGitTest.java
M src/test/java/hudson/plugins/git/browser/RedmineWebTest.java
M src/test/java/hudson/plugins/git/browser/RhodeCodeTest.java
M src/test/java/hudson/plugins/git/browser/ViewGitWebTest.java
A src/test/java/hudson/plugins/git/opt/PreBuildMergeOptionsTest.java
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Conflicts:
src/main/java/hudson/plugins/git/GitSCM.java
Commit: 51bb53d12bf443827a4db394d8163d7d2082e9c6
https://github.com/jenkinsci/git-plugin/commit/51bb53d12bf443827a4db394d8163d7d2082e9c6
Author: Marshall Galbraith <[email protected]>
Date: 2014-07-18 (Fri, 18 Jul 2014)
Changed paths:
M pom.xml
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 300661bc4677ee56b21420809f5616d8115a76a0
https://github.com/jenkinsci/git-plugin/commit/300661bc4677ee56b21420809f5616d8115a76a0
Author: Marshall Galbraith <[email protected]>
Date: 2014-07-23 (Wed, 23 Jul 2014)
Changed paths:
M pom.xml
M src/main/java/hudson/plugins/git/GitChangeLogParser.java
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 0847c82ceccd9d65c6dced829678403605092435
https://github.com/jenkinsci/git-plugin/commit/0847c82ceccd9d65c6dced829678403605092435
Author: Marshall Galbraith <[email protected]>
Date: 2014-08-01 (Fri, 01 Aug 2014)
Changed paths:
M pom.xml
M src/main/java/hudson/plugins/git/GitSCM.java
A src/main/java/hudson/plugins/git/extensions/impl/CheckoutOption.java
M src/main/resources/hudson/plugins/git/BranchSpec/help-name.html
A
src/main/resources/hudson/plugins/git/extensions/impl/CheckoutOption/config.groovy
A
src/main/resources/hudson/plugins/git/extensions/impl/CheckoutOption/help-timeout.html
M src/test/java/hudson/plugins/git/AbstractGitTestCase.java
A src/test/java/hudson/plugins/git/CliGitSCMTriggerLocalPollTest.java
A src/test/java/hudson/plugins/git/CliGitSCMTriggerRemotePollTest.java
M src/test/java/hudson/plugins/git/GitSCMTest.java
A src/test/java/hudson/plugins/git/JGitSCMTriggerLocalPollTest.java
A src/test/java/hudson/plugins/git/JGitSCMTriggerRemotePollTest.java
A src/test/java/hudson/plugins/git/SCMTriggerTest.java
A src/test/java/hudson/plugins/git/extensions/impl/EnforceGitClient.java
A src/test/resources/namespaceBranchRepo.ls-remote
A src/test/resources/namespaceBranchRepo.zip
A src/test/resources/namespaceBranchRepoCreate.sh
A src/test/resources/specialBranchRepo.ls-remote
A src/test/resources/specialBranchRepo.zip
A src/test/resources/specialBranchRepoCreate.sh
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Conflicts:
src/test/java/hudson/plugins/git/AbstractGitTestCase.java
Commit: 400f3e3933f882c3e6d49571acc2be9d8dc70317
https://github.com/jenkinsci/git-plugin/commit/400f3e3933f882c3e6d49571acc2be9d8dc70317
Author: Marshall Galbraith <[email protected]>
Date: 2014-08-02 (Sat, 02 Aug 2014)
Changed paths:
M .gitignore
M src/main/java/hudson/plugins/git/GitChangeSet.java
A src/main/java/hudson/plugins/git/browser/AssemblaWeb.java
A src/main/java/hudson/plugins/git/browser/Gitiles.java
A src/main/resources/hudson/plugins/git/browser/Gitiles/config.jelly
A src/main/resources/hudson/plugins/git/browser/Gitiles/help-url.html
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: bbef8c089c75b074346748a0eb40dedbff5baad7
https://github.com/jenkinsci/git-plugin/commit/bbef8c089c75b074346748a0eb40dedbff5baad7
Author: Mark Waite <[email protected]>
Date: 2014-08-02 (Sat, 02 Aug 2014)
Changed paths:
M src/main/java/hudson/plugins/git/GitSCM.java
M src/test/java/hudson/plugins/git/AbstractGitTestCase.java
M src/test/java/hudson/plugins/git/GitSCMTest.java
Log Message:
-----------
Merge pull request #235 from galbramc/master
[FIXED JENKINS-23179] git pre-merge fails with matrix project
Compare:
https://github.com/jenkinsci/git-plugin/compare/e1ea04c8daca...bbef8c089c75
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
