Skip to content

Commit

Permalink
[FIXED JENKINS-13580] Use 'git whatchanged' instead of 'git show'
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
tcc-jenkins authored and kohsuke committed Jun 26, 2012
1 parent 85d046f commit 3c83d2e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/git/GitAPI.java
Expand Up @@ -326,7 +326,7 @@ public List<String> showRevision(Revision r) throws GitException {
String result = "";

if (revName != null) {
result = launchCommand("show", "--no-abbrev", "--format=raw", "-M", "--raw", revName);
result = launchCommand("whatchanged", "--no-abbrev", "-M", "-m", "--pretty=raw", "-1", revName);
}

List<String> revShow = new ArrayList<String>();
Expand Down

1 comment on commit 3c83d2e

@anatoly-spb
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How to disable -m flag? it breaks polling changes, for example: https://issues.jenkins.io/browse/JENKINS-23606

Please sign in to comment.