use 'git whatchanged' instead of 'git show'#69
use 'git whatchanged' instead of 'git show'#69memory wants to merge 1 commit intojenkinsci:masterfrom memory:master
Conversation
This forces file-by-file evaluation necessary for included/excluded regions to be applied correctly to merge commits. See: https://issues.jenkins-ci.org/browse/JENKINS-13580, which we believe is resolved here.
|
Jenkins » git-plugin #11 SUCCESS |
|
I've opened a pull request with included region which impacts the same part of code. Issue is that multiple commits in one push are ignored : |
|
I'm not exactly sure what the difference is between |
|
Argh, you're actually going to want to revert this in favor of cormallen@61cf887 -- Harry and I figured out a few days ago that 'git show' had some showstopper bugs (see https://gist.github.com/232acf832fd7840eb44a and http://news.gmane.org/find-root.php?message_id=%3cd3e839101b031a7208e74a0b6e22d343d5a093e9.1340136145.git.trast%40student.ethz.ch%3e) and have fallen back to using 'git log'. |
|
(My apologies for not immediately canceling this pull req -- things got a little hectic.) |
|
How to disable -m switch? Look at |
6 participants
This forces file-by-file evaluation necessary for included/excluded
regions to be applied correctly to merge commits.
See: https://issues.jenkins-ci.org/browse/JENKINS-13580, which we
believe is resolved here.