[JIRA] (JENKINS-28907) option to treat merge commiters as regular commiters
Title: Message Title Alexey Milov commented on JENKINS-28907 Re: option to treat merge commiters as regular commiters Where is a link to the patch (although mixed with another one) in issue: https://issues.jenkins-ci.org/browse/JENKINS-32320 that fixes problem with merge commit not appearing by providing option to call whatchanged with -m option, and corresponding change to Jgit calling. I believe the patch can be used to solve this issue after separation and updating to current version of plugins. Add Comment This message was sent by Atlassian Jira (v7.11.2#711002-sha1:fdc329d) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-28907) option to treat merge commiters as regular commiters
Title: Message Title Josiah Eubank commented on JENKINS-28907 Re: option to treat merge commiters as regular commiters The line in question is now https://github.com/jenkinsci/git-client-plugin/blob/master/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java#L972 Add Comment This message was sent by Atlassian JIRA (v7.3.0#73011-sha1:3c73d0e) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-28907) option to treat merge commiters as regular commiters
Title: Message Title Kevin Burnett commented on JENKINS-28907 Re: option to treat merge commiters as regular commiters we investigated this a bit. we found that the only difference between these two, for our repos, was that the git log included some extra commits due to it defaulting to "rev.always_show_header = 1". git whatchanged --no-merges --format="commit %H%ntree %T%nparent %P%nauthor %aN <%aE> %ai%ncommitter %cN <%cE> %ci%n%n%w(76,4,4)%s%n%n%b" git log --raw --no-merges --format="commit %H%ntree %T%nparent %P%nauthor %aN <%aE> %ai%ncommitter %cN <%cE> %ci%n%n%w(76,4,4)%s%n%n%b" there is a check in the git source code where it doesn't set rev.always_show_header to true when --diff-filter is used. so if we set diff filter to not actually filter (by including everything), the git whatchanged and git log commands return identical output for us. so the final equivalent git log command is this: git log --diff-filter=ACDMRTUXB --raw --no-merges --format="commit %H%ntree %T%nparent %P%nauthor %aN <%aE> %ai%ncommitter %cN <%cE> %ci%n%n%w(76,4,4)%s%n%n%b" so, to include merge commits, we can simply remove the --no-merges from the git log, leaving us with: git log --diff-filter=ACDMRTUXB --raw --format="commit %H%ntree %T%nparent %P%nauthor %aN <%aE> %ai%ncommitter %cN <%cE> %ci%n%n%w(76,4,4)%s%n%n%b" pull request at https://github.com/jenkinsci/git-client-plugin/pull/237 that uses this approach and adds merge commits! Add Comment
[JIRA] (JENKINS-28907) option to treat merge commiters as regular commiters
Title: Message Title Mathew Sprehn updated an issue Jenkins / JENKINS-28907 option to treat merge commiters as regular commiters Change By: Mathew Sprehn Component/s: git-client-plugin Add Comment This message was sent by Atlassian JIRA (v7.1.7#71011-sha1:2526d7c) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-28907) option to treat merge commiters as regular commiters
Title: Message Title Mathew Sprehn assigned an issue to Mathew Sprehn Jenkins / JENKINS-28907 option to treat merge commiters as regular commiters Change By: Mathew Sprehn Assignee: Nicolas De Loof Mathew Sprehn Add Comment This message was sent by Atlassian JIRA (v7.1.7#71011-sha1:2526d7c) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-28907) option to treat merge commiters as regular commiters
Title: Message Title Mathew Sprehn commented on JENKINS-28907 Re: option to treat merge commiters as regular commiters git whatchanged is still different. See this answer for more information: http://stackoverflow.com/questions/10022722/difference-between-git-log-and-git-whatchanged#answer-10023369 Add Comment This message was sent by Atlassian JIRA (v7.1.7#71011-sha1:2526d7c) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[JIRA] (JENKINS-28907) option to treat merge commiters as regular commiters
Title: Message Title Bing Shiao commented on JENKINS-28907 Re: option to treat merge commiters as regular commiters Kurtis Miller is correct. Looks like it can be done by making change in this line https://github.com/jenkinsci/git-client-plugin/blob/master/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java#L837 Add Comment This message was sent by Atlassian JIRA (v7.1.7#71011-sha1:2526d7c) -- You received this message because you are subscribed to the Google Groups "Jenkins Issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
