Skip to content
Permalink
Browse files

[FIXED JENKINS-13580] Use 'git whatchanged' instead of 'git show'

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 May 21, 2012
1 parent 85d046f commit 3c83d2e4d38dd882cb7ddd096ff90c936e1f3e7a
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/main/java/hudson/plugins/git/GitAPI.java
@@ -326,7 +326,7 @@ private void whatchanged(String revFrom, String revTo, OutputStream outputStream
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>();

0 comments on commit 3c83d2e

Please sign in to comment.
You can’t perform that action at this time.