BLD: get changed files from common ancestor (#71)

facaiy · seanpmorgan · commit 1eed2e963400 · 2019-03-04T10:20:18.000-05:00
diff --git a/tools/ci_build/builds/builds_common.sh b/tools/ci_build/builds/builds_common.sh
@@ -42,10 +42,12 @@ num_cpus() {
     echo ${N_CPUS}
 }
 
-# List files changed (i.e., added, or revised).
+# List files changed (i.e., added, or revised) from
+# the common ancestor of HEAD and the latest master branch.
 # Usage: get_changed_files_from_master_branch
 get_changed_files_from_master_branch() {
-    git diff origin/master --diff-filter=d --name-only "$@"
+    ANCESTOR=$(git merge-base HEAD master origin/master)
+    git diff ${ANCESTOR} --diff-filter=d --name-only "$@"
 }
 
 # List bazel files changed that still exist,

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,12 @@ num_cpus() {`
`42`	`42`	`echo ${N_CPUS}`
`43`	`43`	`}`
`44`	`44`
`45`		`-# List files changed (i.e., added, or revised).`
	`45`	`+# List files changed (i.e., added, or revised) from`
	`46`	`+# the common ancestor of HEAD and the latest master branch.`
`46`	`47`	`# Usage: get_changed_files_from_master_branch`
`47`	`48`	`get_changed_files_from_master_branch() {`
`48`		`- git diff origin/master --diff-filter=d --name-only "$@"`
	`49`	`+ ANCESTOR=$(git merge-base HEAD master origin/master)`
	`50`	`+ git diff ${ANCESTOR} --diff-filter=d --name-only "$@"`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`# List bazel files changed that still exist,`