LADI
/
py-twisted
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include working tree changes too 

`git diff trunk...` is equivalent to `git diff $(git merge-base trunk
HEAD) HEAD`, which on reflection isn't quite right here because we want
to include changes in the working tree too.

`git diff $(git merge-base trunk HEAD)` gets it right, by explicitly
comparing against the common ancestor but including any changes in the
working tree.
This commit is contained in:
Colin Watson 2019-11-24 13:46:45 +00:00
parent a7cee06d81
commit 41fe30ff40
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tox.ini
View File

@ -129,7 +129,7 @@ commands =
lint: /bin/sh -c "pyflakes $(find src/twisted admin bin \! -name "compat.py" \! -name "test_compat.py" \! -name "dict.py" -name '*.py' -o -name '*.3only')"
lint: {toxinidir}/.travis/twistedchecker-trunk-diff.sh {posargs:twisted}
lint: /bin/sh -c "git diff trunk... | python {toxinidir}/admin/pycodestyle-twisted.py --diff"
lint: /bin/sh -c "git diff $(git merge-base trunk HEAD) | python {toxinidir}/admin/pycodestyle-twisted.py --diff"
apidocs: {toxinidir}/bin/admin/build-apidocs {toxinidir}/src/ apidocs
narrativedocs: sphinx-build -aW -b html -d {toxinidir}/docs/_build {toxinidir}/docs {toxinidir}/docs/_build/