Merge pull request #10845 from tianon/uhhhh

Fix "upstream remote" dependence in Makefile
This commit is contained in:
Sven Dowideit
2015-02-18 10:20:30 +10:00
+1 -1
View File
@@ -84,7 +84,7 @@ build: bundles
docker build -t "$(DOCKER_IMAGE)" .
docs-build:
( git remote | grep -v upstream ) || git diff --name-status upstream/release..upstream/docs docs/ > docs/changed-files
git fetch https://github.com/docker/docker.git docs && git diff --name-status FETCH_HEAD...HEAD -- docs > docs/changed-files
cp ./VERSION docs/VERSION
echo "$(GIT_BRANCH)" > docs/GIT_BRANCH
echo "$(AWS_S3_BUCKET)" > docs/AWS_S3_BUCKET