You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/09/24 20:34:13 UTC
git commit: [Build] Diff from branch point
Repository: spark
Updated Branches:
refs/heads/master 729952a5e -> c42912606
[Build] Diff from branch point
Sometimes Jenkins posts [spurious reports of new classes being added](https://github.com/apache/spark/pull/2339#issuecomment-56570170). I believe this stems from diffing the patch against `master`, as opposed to against `master...`, which starts from the commit the PR was branched from.
This patch fixes that behavior.
Author: Nicholas Chammas <ni...@gmail.com>
Closes #2512 from nchammas/diff-only-commits-ahead and squashes the following commits:
c065599 [Nicholas Chammas] comment typo fix
a453c67 [Nicholas Chammas] diff from branch point
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c4291260
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c4291260
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c4291260
Branch: refs/heads/master
Commit: c429126066f766396b706894b6942f1ca7fcb528
Parents: 729952a
Author: Nicholas Chammas <ni...@gmail.com>
Authored: Wed Sep 24 11:33:58 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Sep 24 11:33:58 2014 -0700
----------------------------------------------------------------------
dev/run-tests-jenkins | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/c4291260/dev/run-tests-jenkins
----------------------------------------------------------------------
diff --git a/dev/run-tests-jenkins b/dev/run-tests-jenkins
index 06c3781..a6ecf31 100755
--- a/dev/run-tests-jenkins
+++ b/dev/run-tests-jenkins
@@ -92,13 +92,13 @@ function post_message () {
merge_note=" * This patch merges cleanly."
source_files=$(
- git diff master --name-only \
+ git diff master... --name-only `# diff patch against master from branch point` \
| grep -v -e "\/test" `# ignore files in test directories` \
| grep -e "\.py$" -e "\.java$" -e "\.scala$" `# include only code files` \
| tr "\n" " "
)
new_public_classes=$(
- git diff master ${source_files} `# diff this patch against master and...` \
+ git diff master... ${source_files} `# diff patch against master from branch point` \
| grep "^\+" `# filter in only added lines` \
| sed -r -e "s/^\+//g" `# remove the leading +` \
| grep -e "trait " -e "class " `# filter in lines with these key words` \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org