8000 Avoid creating an ambiguous reference for usptream/master · amueller/scikit-learn@98678ba · GitHub
[go: up one dir, main page]
Skip to content

Commit 98678ba

Browse files
lestevelesteve
committed
Avoid creating an ambiguous reference for usptream/master
There was a clash between refs/upstream/master and refs/remotes/upstream/master. That was problematic when running flake8_diff.sh locally.
1 parent bd5e85f commit 98678ba

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎build_tools/travis/flake8_diff.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ git log -2 --pretty=short
7272
if [[ -z "$COMMIT_RANGE" ]]; then
7373
REMOTE_MASTER_REF="$REMOTE/master"
7474
# Make sure that $REMOTE_MASTER_REF is a valid reference
75-
git fetch $REMOTE master:refs/$REMOTE_MASTER_REF
75+
git fetch $REMOTE master:refs/remotes/$REMOTE_MASTER_REF
7676

7777
COMMIT=$(git merge-base @ $REMOTE_MASTER_REF) || \
7878
echo "No common ancestor found for $(git show @ -q) and $(git show $REMOTE_MASTER_REF -q)"

0 commit comments

Comments
 (0)
0