Branch: refs/heads/master Home: https://github.com/jenkinsci/git-client-plugin Commit: 815d8989718e7bdac2833fd17da54ba22e1da81c https://github.com/jenkinsci/git-client-plugin/commit/815d8989718e7bdac2833fd17da54ba22e1da81c Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2021-08-02 (Mon, 02 Aug 2021)
Changed paths: M src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java Log Message: ----------- Honor init.defaultBranch in automated tests Command line git is moving towards more inclusive naming. Git 2.32.0 honors the configuration variable `init.defaultBranch` and uses it for the name of the initial branch. Use the global configuration in tests. Commit: 0c4b30212fb1e660c9408ecf81210c2393da0bc8 https://github.com/jenkinsci/git-client-plugin/commit/0c4b30212fb1e660c9408ecf81210c2393da0bc8 Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2021-08-02 (Mon, 02 Aug 2021) Changed paths: M src/test/java/org/jenkinsci/plugins/gitclient/FilePermissionsTest.java M src/test/java/org/jenkinsci/plugins/gitclient/GitAPITest.java M src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java M src/test/java/org/jenkinsci/plugins/gitclient/GitClientFetchTest.java M src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java M src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java Log Message: ----------- Adapt to alternate default branch names Command line git 2.32 and later use the `init.defaultBranch` global configuration setting when creating a new repository. That allows users to define a more inclusive default branch name, like 'main', 'default', or 'baseline'. Many of the git client plugin tests assume the default branch name is 'master'. These changes adapt the tests to support other default branch names. Test this pull request with command line git 2.32.0 or later using the global configuration setting: ``` $ git config --global init.defaultBranch main $ mvn clean verify $ git config --global --unset init.defaultBranch ``` Commit: 7f8aef74d81133451ba3be4e66b81c8733da1e9d https://github.com/jenkinsci/git-client-plugin/commit/7f8aef74d81133451ba3be4e66b81c8733da1e9d Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2021-08-02 (Mon, 02 Aug 2021) Changed paths: M src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java Log Message: ----------- Fix a JGit test failure in GitAPITestCase May cause CliGit tests to fail Commit: 89010e659356ab60a3fc34000ff81ba22376eb9d https://github.com/jenkinsci/git-client-plugin/commit/89010e659356ab60a3fc34000ff81ba22376eb9d Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2021-08-02 (Mon, 02 Aug 2021) Changed paths: M src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java Log Message: ----------- Fix MergeCommandTest Commit: 901cf9ecf0f86ef8276e9d0112283e98631eee0c https://github.com/jenkinsci/git-client-plugin/commit/901cf9ecf0f86ef8276e9d0112283e98631eee0c Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2021-08-02 (Mon, 02 Aug 2021) Changed paths: M src/test/java/org/jenkinsci/plugins/gitclient/GitAPITest.java Log Message: ----------- Remove trailing white space Commit: e2693197e195255b5d2421a99744ac556d88224a https://github.com/jenkinsci/git-client-plugin/commit/e2693197e195255b5d2421a99744ac556d88224a Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2021-08-02 (Mon, 02 Aug 2021) Changed paths: M src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java Log Message: ----------- Remove trailing white space Commit: 6e11d0b1693a9f41dd9857bb6e8940cde12a4b03 https://github.com/jenkinsci/git-client-plugin/commit/6e11d0b1693a9f41dd9857bb6e8940cde12a4b03 Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2021-08-02 (Mon, 02 Aug 2021) Changed paths: M src/test/java/org/jenkinsci/plugins/gitclient/CliGitCommand.java M src/test/java/org/jenkinsci/plugins/gitclient/FilePermissionsTest.java M src/test/java/org/jenkinsci/plugins/gitclient/GitAPITest.java M src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java M src/test/java/org/jenkinsci/plugins/gitclient/GitClientFetchTest.java M src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java M src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java M src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java Log Message: ----------- Don't require git config command to succeed Commit: b3f4322c4d966b3a1e0cc7881df990d862d5f34c https://github.com/jenkinsci/git-client-plugin/commit/b3f4322c4d966b3a1e0cc7881df990d862d5f34c Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2021-08-02 (Mon, 02 Aug 2021) Changed paths: M Jenkinsfile M src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java M src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java Log Message: ----------- Correct messages and comments Commit: 0a1646e510297cbcc1f967d7a56fd7066076c113 https://github.com/jenkinsci/git-client-plugin/commit/0a1646e510297cbcc1f967d7a56fd7066076c113 Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2021-08-02 (Mon, 02 Aug 2021) Changed paths: M src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java Log Message: ----------- Exclude CLI git from assertion Branch name has an unexpected value when using defaultBranchName main Commit: 879cf2c67caf1fabf9ea551a162c67037a1fb590 https://github.com/jenkinsci/git-client-plugin/commit/879cf2c67caf1fabf9ea551a162c67037a1fb590 Author: Mark Waite <mark.earl.wa...@gmail.com> Date: 2021-08-02 (Mon, 02 Aug 2021) Changed paths: M Jenkinsfile M src/test/java/org/jenkinsci/plugins/gitclient/CliGitCommand.java M src/test/java/org/jenkinsci/plugins/gitclient/FilePermissionsTest.java M src/test/java/org/jenkinsci/plugins/gitclient/GitAPITest.java M src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java M src/test/java/org/jenkinsci/plugins/gitclient/GitClientFetchTest.java M src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java M src/test/java/org/jenkinsci/plugins/gitclient/LegacyCompatibleGitAPIImplTest.java M src/test/java/org/jenkinsci/plugins/gitclient/MergeCommandTest.java Log Message: ----------- Merge pull request #733 from MarkEWaite/honor-defaultBranch-configuration Honor defaultBranch configuration Compare: https://github.com/jenkinsci/git-client-plugin/compare/a1529fb57234...879cf2c67caf -- 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 jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/git-client-plugin/push/refs/heads/master/a1529f-879cf2%40github.com.