Branch: refs/heads/stable-2.x
  Home:   https://github.com/jenkinsci/git-client-plugin
  Commit: 8ba5be6345c214ebafc842a6aed58ad2a2551814
      
https://github.com/jenkinsci/git-client-plugin/commit/8ba5be6345c214ebafc842a6aed58ad2a2551814
  Author: rsandell <rsand...@cloudbees.com>
  Date:   2019-09-23 (Mon, 23 Sep 2019)

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

  Log Message:
  -----------
  Fix testcase when cli git signs commit

org.jenkinsci.plugins.gitclient.GitAPITestCase#test_merge_with_message
assumed that the commit message was on line 7 of the revision output.
But when cli git is globally configured to sign each commit then line 7
is the start of the gpg signature (an empty line)

This fix checks if there is such a signature in the revision output
and instead assumes that the commit message is two lines below the
end of the signature.


  Commit: 282e72fa1672214a79cb0dbe6ce92bedc11411ae
      
https://github.com/jenkinsci/git-client-plugin/commit/282e72fa1672214a79cb0dbe6ce92bedc11411ae
  Author: Mark Waite <mark.earl.wa...@gmail.com>
  Date:   2019-09-24 (Tue, 24 Sep 2019)

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

  Log Message:
  -----------
  Merge pull request #464 from rsandell/fix2xtestcasegpg

Fix testcase when cli git signs commit


Compare: 
https://github.com/jenkinsci/git-client-plugin/compare/44e302d002eb...282e72fa1672

-- 
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/stable-2.x/44e302-282e72%40github.com.

Reply via email to