Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/git-client-plugin
  Commit: 725a9ac09ac9c7c5970f1bd3cf6c77503017e35f
      
https://github.com/jenkinsci/git-client-plugin/commit/725a9ac09ac9c7c5970f1bd3cf6c77503017e35f
  Author: Mark Waite <[email protected]>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
    A 
src/test/java/org/jenkinsci/plugins/gitclient/SubmodulePatternStringTest.java

  Log Message:
  -----------
  Add [JENKINS-46054] failing tests

If the repository URL for a submodule includes ".url" in the
URL, then the submodule query code in the command line git
implementation gathers the wrong name as the name of the
submodule.

These tests check specific conditions with the regular
expression string used to parse the "git config"
output.

They intentionally fail with the current regular expression.


  Commit: 81392eda3c65e023d82ca69221070c080128cd26
      
https://github.com/jenkinsci/git-client-plugin/commit/81392eda3c65e023d82ca69221070c080128cd26
  Author: Mark Waite <[email protected]>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java

  Log Message:
  -----------
  Add [JENKINS-46054] integration test

Prior to the fix, this test fails on command line git but passes
on JGit.

After the fix, the test passes on both implementations.


  Commit: 52f681e6153eb088495edd497a82d6dc919dcae3
      
https://github.com/jenkinsci/git-client-plugin/commit/52f681e6153eb088495edd497a82d6dc919dcae3
  Author: Mark Waite <[email protected]>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java

  Log Message:
  -----------
  [Fixed JENKINS-46054] submodule repo URL with '.url' substring failed

Modify the submodule config parsing regular expression to correctly
extract the submodule name from the config output.

Splits cli submodule URL regexp use into two cases.

git config --get-regex applies the regex to match keys, and returns all
matches (including substring matches).

Thus, a config call:

  git config -f .gitmodules --get-regexp "^submodule\.([^ ]+)\.url"

will report two lines of output if the submodule URL includes ".url":

  submodule.modules/JENKINS-46504.url.path modules/JENKINS-46504.url
  submodule.modules/JENKINS-46504.url.url 
https://github.com/MarkEWaite/JENKINS-46054.url

The code originally used the same pattern for get-regexp and for output parsing.
By using the same pattern in both places, it incorrectly took the first line
of output as the URL of a submodule (when it is instead the path of a 
submodule).

Fixes tests added in previous commits.


  Commit: b8bad8ab164e146e24eb38bc3a0715374eb25587
      
https://github.com/jenkinsci/git-client-plugin/commit/b8bad8ab164e146e24eb38bc3a0715374eb25587
  Author: Mark Waite <[email protected]>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
    M src/test/java/org/jenkinsci/plugins/gitclient/GitClientTest.java
    A 
src/test/java/org/jenkinsci/plugins/gitclient/SubmodulePatternStringTest.java

  Log Message:
  -----------
  Merge pull request #284 from MarkEWaite/fix-submodule-url-regex

Fix submodule url regex [JENKINS-46054]


Compare: 
https://github.com/jenkinsci/git-client-plugin/compare/c2b1ff48f3a3...b8bad8ab164e

-- 
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.

Reply via email to