Fix target determination file diffing (pytorch#38661)

yns88 · facebook-github-bot · commit 8d649862023b · 2020-05-19T08:47:41.000-07:00
Summary: It seems like all this time this was accidentally doing a 3-way merge-base, oops. Pull Request resolved: pytorch#38661 Test Plan: ``` $ git checkout gh/mohammadmahdijavanmard/1/head $ git merge-base origin master HEAD --all 8292742 $ git merge-base origin/master HEAD --all 324dc16 ``` Differential Revision: D21640939 Pulled By: yns88 fbshipit-source-id: 0f59922e7c0fd046f48fec30e8aa25c244f6dd62
diff --git a/.jenkins/pytorch/common.sh b/.jenkins/pytorch/common.sh
@@ -187,7 +187,7 @@ function file_diff_from_base() {
   set +e
   git fetch origin master --quiet
   set -e
-  git diff --name-only "$(git merge-base origin master HEAD)" > "$1"
+  git diff --name-only "$(git merge-base origin/master HEAD)" > "$1"
 }
 
 function get_bazel() {

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ function file_diff_from_base() {`
`187`	`187`	`set +e`
`188`	`188`	`git fetch origin master --quiet`
`189`	`189`	`set -e`
`190`		`- git diff --name-only "$(git merge-base origin master HEAD)" > "$1"`
	`190`	`+ git diff --name-only "$(git merge-base origin/master HEAD)" > "$1"`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`function get_bazel() {`