diff options
| author | Nicholas Chammas <nicholas.chammas@gmail.com> | 2014-09-24 11:33:58 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-09-24 11:33:58 -0700 |
| commit | c429126066f766396b706894b6942f1ca7fcb528 (patch) | |
| tree | 3fb53c14d4066021839823bdd7e641a2da97686c /dev | |
| parent | 729952a5efce755387c76cdf29280ee6f49fdb72 (diff) | |
| download | spark-c429126066f766396b706894b6942f1ca7fcb528.tar.gz spark-c429126066f766396b706894b6942f1ca7fcb528.tar.bz2 spark-c429126066f766396b706894b6942f1ca7fcb528.zip | |
[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 <nicholas.chammas@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
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/run-tests-jenkins | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/run-tests-jenkins b/dev/run-tests-jenkins index 06c3781eb3..a6ecf3196d 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` \ |